UBUNTU: [Config] Update CONFIG_E1000E for ppc64el in annotations

BugLink: https://bugs.launchpad.net/bugs/1902687
This option now depends on CONFIG_DMI, and thus is no longer
selectable for ppc64el. Update the annotations accordingly.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/abi/5.10.0-1.2/modules.ignore b/debian.master/abi/5.10.0-1.2/modules.ignore
index a588b7ca129a0f2e2aa0521480c64422500ea884..544e611f5558af243c6f35ebcd68ef4937f981df 100644 (file)
--- a/debian.master/abi/5.10.0-1.2/modules.ignore
+++ b/debian.master/abi/5.10.0-1.2/modules.ignore
@@ -3,3 +3,4 @@ arc4
 khazad
 seed
 tea
+e1000e

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 4fb81e60ec9691e10966432db9acbbede8781d2d..3ccf799449507a4d36cb9afe1379e1991723d3fb 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5739,7 +5739,7 @@ CONFIG_NET_VENDOR_I825XX                        policy<{'amd64': 'y', 'arm64': '
 CONFIG_NET_VENDOR_INTEL                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_E100                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_E1000                                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_E1000E                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
+CONFIG_E1000E                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm'}>
 CONFIG_E1000E_HWTS                              policy<{'amd64': 'y'}>
 CONFIG_IGB                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_IGB_HWMON                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>