Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm

[firefly-linux-kernel-4.4.55.git] / include / linux / drbd.h

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index d10431fab004733bcf76e759f882e23ede8629f7..cec467f5d6768ae92f958058ab93f20edba28ec6 100644 (file)
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -36,7 +36,7 @@
 #include <sys/wait.h>
 #include <limits.h>
 
-/* Altough the Linux source code makes a difference between
+/* Although the Linux source code makes a difference between
    generic endianness and the bitfields' endianness, there is no
    architecture as of Linux-2.6.24-rc4 where the bitfileds' endianness
    does not match the generic endianness. */
@@ -53,7 +53,7 @@
 
 
 extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.3.9"
+#define REL_VERSION "8.3.10"
 #define API_VERSION 88
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 96
@@ -153,6 +153,8 @@ enum drbd_ret_code {
        ERR_NEED_APV_93         = 153,
        ERR_STONITH_AND_PROT_A  = 154,
        ERR_CONG_NOT_PROTO_A    = 155,
+       ERR_PIC_AFTER_DEP       = 156,
+       ERR_PIC_PEER_DEP        = 157,
 
        /* insert new ones above this line */
        AFTER_LAST_ERR_CODE
@@ -182,7 +184,7 @@ enum drbd_conns {
        /* These temporal states are all used on the way
         * from >= C_CONNECTED to Unconnected.
         * The 'disconnect reason' states
-        * I do not allow to change beween them. */
+        * I do not allow to change between them. */
        C_TIMEOUT,
        C_BROKEN_PIPE,
        C_NETWORK_FAILURE,