git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
include
/
linux
/
drbd_nl.h
diff --git
a/include/linux/drbd_nl.h
b/include/linux/drbd_nl.h
index
db5721a
..
a4d82f8
100644
(file)
--- 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,