[PATCH 1/1][SRU][OEM-6.0] UBUNTU: [Config] Disable IWLMEI

[You-Sheng Yang]

From: "You-Sheng Yang (vicamo)" <vicamo.yang at canonical.com>

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

diff --git a/debian.oem/abi/amd64/oem.modules b/debian.oem/abi/amd64/oem.modules
index c66ff91e10e1..2cc4ea66a7ce 100644
--- a/debian.oem/abi/amd64/oem.modules
+++ b/debian.oem/abi/amd64/oem.modules
@@ -2454,7 +2454,6 @@ iwl3945
 iwl4965
 iwldvm
 iwlegacy
-iwlmei
 iwlmvm
 iwlwifi
 ix2505v
diff --git a/debian.oem/config/annotations b/debian.oem/config/annotations
index d5f1b5d2fd4f..3bd07e1cf050 100644
--- a/debian.oem/config/annotations
+++ b/debian.oem/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.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu
index 326efea342b9..4d1a443ddbfe 100644
--- a/debian.oem/config/config.common.ubuntu
+++ b/debian.oem/config/config.common.ubuntu
@@ -3990,7 +3990,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
-- 
2.37.2