Patchwork UBUNTU: [Config] Enable DRBD as a module

login
register
mail settings
Submitter John Johansen
Date July 15, 2010, 11:27 p.m.
Message ID <1279236458-20728-2-git-send-email-john.johansen@canonical.com>
Download mbox | patch
Permalink /patch/59051/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

John Johansen - July 15, 2010, 11:27 p.m.
DRBD used to be supported via DKMS but now that it is upstream enable
it as a module.

Signed-off-by: John Johansen <john.johansen@canonical.com>
---
 debian.master/config/config.common.ubuntu |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Leann Ogasawara - July 17, 2010, 1:03 a.m.
Applied to Maverick linux master.

Thanks,
Leann

On Thu, 2010-07-15 at 16:27 -0700, John Johansen wrote:
> DRBD used to be supported via DKMS but now that it is upstream enable
> it as a module.
> 
> Signed-off-by: John Johansen <john.johansen@canonical.com>
> ---
>  debian.master/config/config.common.ubuntu |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index fdee92e..eb18f85 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -423,7 +423,7 @@ CONFIG_BLK_DEV_COMPCACHE=m
>  CONFIG_BLK_DEV_CRYPTOLOOP=m
>  CONFIG_BLK_DEV_DAC960=m
>  CONFIG_BLK_DEV_DM=y
> -# CONFIG_BLK_DEV_DRBD is not set
> +CONFIG_BLK_DEV_DRBD=m
>  CONFIG_BLK_DEV_FD=m
>  # CONFIG_BLK_DEV_HD is not set
>  CONFIG_BLK_DEV_INITRD=y
> @@ -1032,6 +1032,7 @@ CONFIG_DNOTIFY=y
>  CONFIG_DONGLE=y
>  CONFIG_DOUBLEFAULT=y
>  CONFIG_DRAGONRISE_FF=y
> +# CONFIG_DRBD_FAULT_INJECTION is not set
>  CONFIG_DRM=m
>  CONFIG_DRM_I2C_CH7006=m
>  CONFIG_DRM_I810=m
> @@ -2406,6 +2407,7 @@ CONFIG_LOGITECH_FF=y
>  CONFIG_LP486E=m
>  CONFIG_LPC_SCH=m
>  # CONFIG_LP_CONSOLE is not set
> +CONFIG_LRU_CACHE=m
>  CONFIG_LSI_ET1011C_PHY=y
>  CONFIG_LSM_MMAP_MIN_ADDR=0
>  CONFIG_LTPC=m
> -- 
> 1.7.0.4
> 
>

Patch

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index fdee92e..eb18f85 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -423,7 +423,7 @@  CONFIG_BLK_DEV_COMPCACHE=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_DM=y
-# CONFIG_BLK_DEV_DRBD is not set
+CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -1032,6 +1032,7 @@  CONFIG_DNOTIFY=y
 CONFIG_DONGLE=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DRAGONRISE_FF=y
+# CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_DRM=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I810=m
@@ -2406,6 +2407,7 @@  CONFIG_LOGITECH_FF=y
 CONFIG_LP486E=m
 CONFIG_LPC_SCH=m
 # CONFIG_LP_CONSOLE is not set
+CONFIG_LRU_CACHE=m
 CONFIG_LSI_ET1011C_PHY=y
 CONFIG_LSM_MMAP_MIN_ADDR=0
 CONFIG_LTPC=m