| Message ID | 20211101190623.29597-2-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Focal] UBUNTU: [Config] CONFIG_MICROSOFT_MANA=y | expand |
diff --git a/debian.azure/abi/5.4.0-1062.65/amd64/azure.modules b/debian.azure/abi/5.4.0-1062.65/amd64/azure.modules index 0cb75b9745fab..a0abe2a50ed11 100644 --- a/debian.azure/abi/5.4.0-1062.65/amd64/azure.modules +++ b/debian.azure/abi/5.4.0-1062.65/amd64/azure.modules @@ -1008,7 +1008,6 @@ macvtap madera madera-i2c madera-spi -mana marvell10g matrix-keymap max1111 diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 355dc2dd1ae54..ae3c84cc1ac2c 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -4,6 +4,9 @@ include "../../debian.master/config/annotations" +CONFIG_MICROSOFT_MANA policy<{'amd64': 'y'}> +CONFIG_MICROSOFT_MANA mark<ENFORCED> note<LP:1949357> + CONFIG_ACPI_HOTPLUG_MEMORY policy<{'amd64': 'n'}> CONFIG_ACPI_HOTPLUG_MEMORY mark<ENFORCED> note<LP:#1671203> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index dd2294c8d4f04..2b4aec1ea3024 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -2873,7 +2873,7 @@ CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_OLD_INTERFACE=y # CONFIG_MICROSEMI_PHY is not set -CONFIG_MICROSOFT_MANA=m +CONFIG_MICROSOFT_MANA=y CONFIG_MIGRATION=y CONFIG_MII=m CONFIG_MINIX_FS=m
BugLink: https://bugs.launchpad.net/bugs/1949357 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.azure/abi/5.4.0-1062.65/amd64/azure.modules | 1 - debian.azure/config/annotations | 3 +++ debian.azure/config/config.common.ubuntu | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)