[bionic/azure] UBUNTU: [Config] linux-azure: CONFIG_BLK_DEV_DRBD=m

Message ID 20180706212229.2784-1-marcelo.cerri@canonical.com
State New
Headers show
Series
  • [bionic/azure] UBUNTU: [Config] linux-azure: CONFIG_BLK_DEV_DRBD=m
Related show

Commit Message

Marcelo Henrique Cerri July 6, 2018, 9:22 p.m.
BugLink: http://bugs.launchpad.net/bugs/1780309

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
---
 debian.azure/config/config.common.ubuntu    | 4 +++-
 debian.azure/control.d/azure.inclusion-list | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

Comments

Kamal Mostafa July 6, 2018, 9:24 p.m. | #1
Acked-by: Kamal Mostafa <kamal@canonical.com>

On Fri, Jul 06, 2018 at 06:22:29PM -0300, Marcelo Henrique Cerri wrote:
> BugLink: http://bugs.launchpad.net/bugs/1780309
> 
> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
> ---
>  debian.azure/config/config.common.ubuntu    | 4 +++-
>  debian.azure/control.d/azure.inclusion-list | 1 +
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
> index 17f06ad0c3d6..8ea51473f3dd 100644
> --- a/debian.azure/config/config.common.ubuntu
> +++ b/debian.azure/config/config.common.ubuntu
> @@ -423,7 +423,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
>  # CONFIG_BLK_DEV_DAC960 is not set
>  CONFIG_BLK_DEV_DM=y
>  CONFIG_BLK_DEV_DM_BUILTIN=y
> -# CONFIG_BLK_DEV_DRBD is not set
> +CONFIG_BLK_DEV_DRBD=m
>  # CONFIG_BLK_DEV_FD is not set
>  CONFIG_BLK_DEV_INITRD=y
>  CONFIG_BLK_DEV_INTEGRITY=y
> @@ -1100,6 +1100,7 @@ CONFIG_DP83822_PHY=m
>  # CONFIG_DPM_WATCHDOG is not set
>  CONFIG_DPTF_POWER=m
>  CONFIG_DQL=y
> +# CONFIG_DRBD_FAULT_INJECTION is not set
>  CONFIG_DRM=m
>  CONFIG_DRM_AMDGPU=m
>  CONFIG_DRM_AMDGPU_CIK=y
> @@ -2482,6 +2483,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  # CONFIG_LP_CONSOLE is not set
> +CONFIG_LRU_CACHE=m
>  # CONFIG_LSI_ET1011C_PHY is not set
>  CONFIG_LSM_MMAP_MIN_ADDR=0
>  CONFIG_LWTUNNEL=y
> diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list
> index 1a167a847075..f1a4deffb495 100644
> --- a/debian.azure/control.d/azure.inclusion-list
> +++ b/debian.azure/control.d/azure.inclusion-list
> @@ -18,6 +18,7 @@ drivers/ata/libahci_platform.ko
>  drivers/ata/pata_acpi.ko
>  drivers/block/brd.ko
>  drivers/block/cryptoloop.ko
> +drivers/block/drbd/drbd.ko
>  drivers/block/floppy.ko
>  drivers/block/loop.ko
>  drivers/block/nbd.ko
> -- 
> 2.17.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Po-Hsu Lin July 9, 2018, 2:48 a.m. | #2
Acked-by: Po-Hsu Lin <po-hsu.lin@canonical.com>

Patch

diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 17f06ad0c3d6..8ea51473f3dd 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -423,7 +423,7 @@  CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_DAC960 is not set
 CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DM_BUILTIN=y
-# CONFIG_BLK_DEV_DRBD is not set
+CONFIG_BLK_DEV_DRBD=m
 # CONFIG_BLK_DEV_FD is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
@@ -1100,6 +1100,7 @@  CONFIG_DP83822_PHY=m
 # CONFIG_DPM_WATCHDOG is not set
 CONFIG_DPTF_POWER=m
 CONFIG_DQL=y
+# CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_DRM=m
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_CIK=y
@@ -2482,6 +2483,7 @@  CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 # CONFIG_LP_CONSOLE is not set
+CONFIG_LRU_CACHE=m
 # CONFIG_LSI_ET1011C_PHY is not set
 CONFIG_LSM_MMAP_MIN_ADDR=0
 CONFIG_LWTUNNEL=y
diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list
index 1a167a847075..f1a4deffb495 100644
--- a/debian.azure/control.d/azure.inclusion-list
+++ b/debian.azure/control.d/azure.inclusion-list
@@ -18,6 +18,7 @@  drivers/ata/libahci_platform.ko
 drivers/ata/pata_acpi.ko
 drivers/block/brd.ko
 drivers/block/cryptoloop.ko
+drivers/block/drbd/drbd.ko
 drivers/block/floppy.ko
 drivers/block/loop.ko
 drivers/block/nbd.ko