aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2010-01-12 11:05:11 +0100
committerJens Axboe <jens.axboe@oracle.com>2010-01-12 11:05:11 +0100
commit2705ca7959111882097da1ebbe401d5566780904 (patch)
tree61b5907e86578c36bfe0e7f32bcf2c74fa8aab41 /include
parent23978161f90e5a3200ad6ac9b0d534911e4cbb28 (diff)
parent2ebccd71a71e6078920bc65b40f120e72b71c2b6 (diff)
downloadlinux-linaro-android-2705ca7959111882097da1ebbe401d5566780904.tar.gz
Merge branch 'for-jens' of http://git.drbd.org/linux-2.6-drbd into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/linux/drbd.h2
-rw-r--r--include/linux/drbd_nl.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index e84f4733cb5..78962272338 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -53,7 +53,7 @@
extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.3.6"
+#define REL_VERSION "8.3.7"
#define API_VERSION 88
#define PRO_VERSION_MIN 86
#define PRO_VERSION_MAX 91
diff --git a/include/linux/drbd_nl.h b/include/linux/drbd_nl.h
index db5721ad50d..a4d82f89599 100644
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
@@ -69,6 +69,7 @@ NL_PACKET(disconnect, 6, )
NL_PACKET(resize, 7,
NL_INT64( 29, T_MAY_IGNORE, resize_size)
+ NL_BIT( 68, T_MAY_IGNORE, resize_force)
)
NL_PACKET(syncer_conf, 8,