kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-jens' of http://git.drbd.org/linux-2.6-drbd into for-linus

Browse source
This commit is contained in:
Jens Axboe 2010-01-12 11:05:11 +01:00
commit 2705ca7959
5 changed files with 40 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/drbd.h
View file

@ -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

1
include/linux/drbd_nl.h
View file

@ -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,