diff mbox series

[1/1,SRU,Unstable/Kinetic] UBUNTU: [Config] Disable IWLMEI

Message ID 20220906081933.2223575-4-vicamo.yang@canonical.com
State New
Headers show
Series [1/1,SRU,Unstable/Kinetic] UBUNTU: [Config] Disable IWLMEI | expand

Commit Message

You-Sheng Yang Sept. 6, 2022, 8:19 a.m. UTC 
From: "You-Sheng Yang (vicamo)" <vicamo.yang@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1987312
Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang@canonical.com>
---
 debian.master/abi/amd64/generic.modules   | 1 -
 debian.master/config/annotations          | 2 ++
 debian.master/config/config.common.ubuntu | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/abi/amd64/generic.modules b/debian.master/abi/amd64/generic.modules
index e84ccff845d2..dcc4bf74fa15 100644
--- a/debian.master/abi/amd64/generic.modules
+++ b/debian.master/abi/amd64/generic.modules
@@ -2449,7 +2449,6 @@  iwl3945
 iwl4965
 iwldvm
 iwlegacy
-iwlmei
 iwlmvm
 iwlwifi
 ix2505v
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 6b3ab6a533fb..f1b584292fec 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6742,7 +6742,9 @@  CONFIG_IPW2200_DEBUG                            policy<{'amd64': 'n', 'arm64': '
 # Menu: Device Drivers >> Network device support >> Wireless LAN >> Intel devices >> Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlwifi)
 CONFIG_IWLWIFI                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_IWLDVM                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
+CONFIG_IWLMEI                                   policy<{'amd64': 'n'}>
 CONFIG_IWLMVM                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
+CONFIG_IWLMEI                                   mark<ENFORCED> note<LP: #1987312>
 
 # Menu: Device Drivers >> Network device support >> Wireless LAN >> Intel devices >> Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlwifi) >> Debugging Options
 CONFIG_IWLWIFI_DEBUG                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c8c4d20e0fd1..e5676fa3bf10 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5612,7 +5612,7 @@  CONFIG_IWLDVM=m
 CONFIG_IWLEGACY=m
 # CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWLEGACY_DEBUGFS=y
-CONFIG_IWLMEI=m
+# CONFIG_IWLMEI is not set
 CONFIG_IWLMVM=m
 CONFIG_IWLWIFI=m
 # CONFIG_IWLWIFI_DEBUG is not set