[PATCH 4/5] UBUNTU: {Config] azure: arm64: Enable RAID config options

Tue Apr 12 17:20:13 UTC 2022

BugLink: https://bugs.launchpad.net/bugs/1968749

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.azure/config/amd64/config.common.amd64 | 11 -----------
 debian.azure/config/arm64/config.common.arm64 | 11 -----------
 debian.azure/config/config.common.ubuntu      | 12 ++++++++++++
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64
index 7e106f39767a8..f289dffa93771 100644
--- a/debian.azure/config/amd64/config.common.amd64
+++ b/debian.azure/config/amd64/config.common.amd64
@@ -65,7 +65,6 @@ CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_RBD=m
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_ZONED=y
@@ -234,7 +233,6 @@ CONFIG_DM_INTEGRITY=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_LOG_WRITES=m
 CONFIG_DM_MULTIPATH=m
-CONFIG_DM_RAID=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
@@ -619,19 +617,12 @@ CONFIG_MDIO_MSCC_MIIM=m
 CONFIG_MD_FAULTY=m
 CONFIG_MD_LINEAR=m
 CONFIG_MD_MULTIPATH=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
 # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
 # CONFIG_MEDIA_CAMERA_SUPPORT is not set
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 # CONFIG_MEDIA_USB_SUPPORT is not set
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_SAS=m
 CONFIG_MELLANOX_PLATFORM=y
 # CONFIG_MEMCG_SWAP_ENABLED is not set
 CONFIG_MEN_A21_WDT=m
@@ -1149,7 +1140,6 @@ CONFIG_SCHED_STACK_END_CHECK=y
 CONFIG_SCHED_TRACER=y
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_ACARD=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_AIC79XX=m
@@ -1178,7 +1168,6 @@ CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_MYRB=m
 CONFIG_SCSI_MYRS=m
 CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_PMCRAID=m
 CONFIG_SCSI_PROC_FS=y
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_QLOGIC_1280=m
diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64
index 04f89bf4de80d..b938974196df1 100644
--- a/debian.azure/config/arm64/config.common.arm64
+++ b/debian.azure/config/arm64/config.common.arm64
@@ -65,7 +65,6 @@ CONFIG_BATTERY_SBS=m
 # CONFIG_BLK_CMDLINE_PARSER is not set
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_BLK_DEV_MD=m
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_THROTTLING is not set
 # CONFIG_BLK_DEV_ZONED is not set
@@ -234,7 +233,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 # CONFIG_DM_LOG_USERSPACE is not set
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_MULTIPATH is not set
-# CONFIG_DM_RAID is not set
 # CONFIG_DM_SNAPSHOT is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_THIN_PROVISIONING is not set
@@ -619,19 +617,12 @@ CONFIG_MDIO_THUNDER=y
 # CONFIG_MD_FAULTY is not set
 # CONFIG_MD_LINEAR is not set
 # CONFIG_MD_MULTIPATH is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID10 is not set
-# CONFIG_MD_RAID456 is not set
 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 # CONFIG_MEDIA_CEC_SUPPORT is not set
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-CONFIG_MEGARAID_SAS=y
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_MEMCG_SWAP_ENABLED=y
 # CONFIG_MEN_A21_WDT is not set
@@ -1149,7 +1140,6 @@ CONFIG_SATA_MOBILE_LPM_POLICY=0
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_AIC79XX is not set
@@ -1178,7 +1168,6 @@ CONFIG_SATA_MOBILE_LPM_POLICY=0
 # CONFIG_SCSI_MYRB is not set
 # CONFIG_SCSI_MYRS is not set
 # CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_PMCRAID is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index f4bc2103fd62b..f2ecafc16d457 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -514,6 +514,7 @@ CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
 CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
@@ -739,6 +740,7 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_BLK_DEV_NVME=y
@@ -1585,6 +1587,7 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_RAID=m
 # CONFIG_DM_VERITY_FEC is not set
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_ZERO=m
@@ -3533,6 +3536,10 @@ CONFIG_MDIO_XGENE=y
 # CONFIG_MDM_LCC_9615 is not set
 CONFIG_MD_AUTODETECT=y
 CONFIG_MD_CLUSTER=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
 # CONFIG_MEDIATEK_MT6577_AUXADC is not set
 CONFIG_MEDIATEK_WATCHDOG=y
 CONFIG_MEDIA_ATTACH=y
@@ -3582,8 +3589,11 @@ CONFIG_MEDIA_TUNER_TUA9001=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_SAS=m
 CONFIG_MEMBARRIER=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_KMEM=y
@@ -5398,6 +5408,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SCIF_BUS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_AHA1740=m
 CONFIG_SCSI_BFA_FC=m
 # CONFIG_SCSI_BNX2_ISCSI is not set
@@ -5434,6 +5445,7 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 # CONFIG_SCSI_MVSAS_TASKLET is not set
 CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PMCRAID=m
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_QLA_FC=m
 CONFIG_SCSI_SAS_ATA=y
-- 
2.35.1


