UBUNTU: [Config] CONFIG_SCSI_HISI_SAS=m on arm64

Signed-off-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 5672250fa941fc51ba755ee64fe534bf58a1cb00..6e5443f1bfd4882f5e2a060d153da9053be98c03 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5935,7 +5935,7 @@ CONFIG_SCSI_AHA1740                             policy<{'i386': 'm'}>
 CONFIG_SCSI_AACRAID                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_SCSI_AIC94XX                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_AIC94XX_DEBUG                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
-CONFIG_SCSI_HISI_SAS                            policy<{'arm64': 'n'}>
+CONFIG_SCSI_HISI_SAS                            policy<{'arm64': 'm'}>
 CONFIG_SCSI_MVSAS                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_SCSI_MVSAS_DEBUG                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
 CONFIG_SCSI_MVSAS_TASKLET                       policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d0228d6de32a37400189451c086a18d1339934e7..8b1619344ca3ae6ab84f3724e4f9ef4794d246f9 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7257,7 +7257,7 @@ CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_FLASHPOINT=y
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
-# CONFIG_SCSI_HISI_SAS is not set
+CONFIG_SCSI_HISI_SAS=m
 CONFIG_SCSI_IBMVFC=m
 CONFIG_SCSI_IBMVFC_TRACE=y
 CONFIG_SCSI_IBMVSCSI=m