add drbd back to taobao kernel since aliyun use it.

- Update config files.
g112wdh · Sep 26, 2012 · c9ecc93 · c9ecc93
1 parent 1697870
commit c9ecc93
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/config/kernel-2.6.32-x86_64-debug.config b/config/kernel-2.6.32-x86_64-debug.config
@@ -1227,6 +1227,8 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_DRBD_TRACE=m
 CONFIG_MISC_DEVICES=y
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set

diff --git a/config/kernel-2.6.32-x86_64.config b/config/kernel-2.6.32-x86_64.config
@@ -1227,6 +1227,8 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_DRBD_TRACE=m
 CONFIG_MISC_DEVICES=y
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set

diff --git a/kernel-source.changes b/kernel-source.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 26 21:55:47 CST 2012 - [email protected]
+
+add drbd back to taobao kernel since aliyun use it.
+
+- Update config files.
+
 -------------------------------------------------------------------
 Fri Sep 14 21:32:13 CST 2012 - [email protected]
 

diff --git a/series.conf b/series.conf
@@ -61,7 +61,7 @@ patches.driver/bnx2-disable-msi-when-no-per-vector-masking.patch
 #patches.driver/igb-fix-default-behavior-of-RSS-parameter-to-automatically-detect-number-of-Rx-Tx-queues.patch
 
 # drbd driver 8.3.10
-+disable-temprary patches.driver/drbd-8.3.10.patch
+patches.driver/drbd-8.3.10.patch
 #disable pcie-aspm
 patches.taobao/pcie_aspm_disable_on_default.patch