[SRU][K][PATCH 05/16] UBUNTU: [Config] Disable CONFIG_SCSI_IZIP_EPP16 on riscv64

[Emil Renner Berthing]

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

This option was not annotated in the linux-riscv tree, so let's align it
with the other architectures.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/annotations                   | 2 +-
 debian.master/config/arm64/config.common.arm64     | 1 -
 debian.master/config/armhf/config.common.armhf     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/riscv64/config.common.riscv64 | 1 -
 7 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 1cb0fb296963..5825c60bacb0 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -577,7 +577,6 @@ CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
 CONFIG_SCSI_MPI3MR=m
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 71c482bec6d2..a2f2f146ee7d 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8100,7 +8100,7 @@ CONFIG_SCSI_INITIO                              policy<{'amd64': 'm', 'arm64': '
 CONFIG_SCSI_INIA100                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}>
 CONFIG_SCSI_PPA                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_SCSI_IMM                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
-CONFIG_SCSI_IZIP_EPP16                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'y'}>
+CONFIG_SCSI_IZIP_EPP16                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}>
 CONFIG_SCSI_IZIP_SLOW_CTR                       policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}>
 CONFIG_SCSI_STEX                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}>
 CONFIG_SCSI_IPR                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index c80f07c0c44a..5700acdf2ea9 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -601,7 +601,6 @@ CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
 CONFIG_SCSI_MPI3MR=m
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 5a8d7276a948..397aea89dc9f 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -583,7 +583,6 @@ CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
 CONFIG_SCSI_MPI3MR=m
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d73c560c84bc..b1b056f2b328 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9577,6 +9577,7 @@ CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_LOWLEVEL=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index d449c1ff14bd..dd03e5e55001 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -584,7 +584,6 @@ CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
 CONFIG_SCSI_MPI3MR=m
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 4ae9ad712de5..69bd3166d764 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -573,7 +573,6 @@ CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
-CONFIG_SCSI_IZIP_EPP16=y
 CONFIG_SCSI_MPI3MR=m
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
-- 
2.36.1