Index: scripts/patch-kernel =================================================================== --- scripts/patch-kernel (revision 2654) +++ scripts/patch-kernel (working copy) @@ -94,15 +94,16 @@ # clean it first make -s -C $DRBD/drbd clean # XXX drbd_config.h probably needs different treatment. -cp -a $DRBD/drbd/linux/drbd{,_config}.h $DRBD_BASE/include/linux/ +cp -a $DRBD/drbd/linux/drbd*.h $DRBD_BASE/include/linux/ cp -a $DRBD/drbd/{*.[ch],Kconfig} $DRBD_SUB # and the right in-kernel-tree Makefile cp -a $DRBD/drbd/Makefile-2.$KDIR_PATCHLEVEL $DRBD_SUB/Makefile # remove some backports -test "$KDIR_PATCHLEVEL" = 6 && rm $DRBD_SUB/mempool* +test "$KDIR_PATCHLEVEL" = 6 && rm -f $DRBD_SUB/mempool* +test "$KDIR_PATCHLEVEL" = 6 && rm -f $DRBD_SUB/connector* grep "HLIST_HEAD_INIT" $KERNEL/include/linux/list.h >/dev/null && - rm $DRBD_SUB/hlist.h + rm -f $DRBD_SUB/hlist.h # disable __arch_um__ to_virt() hack sed -e 's/^#ifdef __arch_um__/#if 0/' \ @@ -111,7 +112,7 @@ # and, in case this kernel was already patched: if test -e $KERNEL/include/linux/drbd.h ; then $INCREMENT || fatal "drbd already in $KERNEL" - cp -a $KERNEL/include/linux/drbd{,_config}.h \ + cp -a $KERNEL/include/linux/drbd*.h \ $KERNEL_BASE/include/linux/ cp -a $KERNEL/drivers/block/drbd/{*.[ch],Makefile,Kconfig} \ $KERNEL_BASE/drivers/block/drbd/ Index: drbd/Kconfig =================================================================== --- drbd/Kconfig (revision 2654) +++ drbd/Kconfig (working copy) @@ -5,6 +5,7 @@ tristate "DRBD Distributed replicated block device support" select INET select PROC_FS + select CONNECTOR ---help--- Drbd is a block device which is designed to build high availability clusters. This is done by mirroring a whole block device via (a Index: drbd/drbd_nl.c =================================================================== --- drbd/drbd_nl.c (revision 2654) +++ drbd/drbd_nl.c (working copy) @@ -35,7 +35,7 @@ #include #include -#include +#include "drbd_int.h" #include #include