From f6b3364bbb7e339be336916287349f23acb26711 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Fri, 19 Feb 2021 17:10:00 +0100
Subject: [PATCH] UBUNTU: [Config] Allow ASM_MODVERSIONS and MODULE_REL_CRCS

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

Both appear after MODVERSIONS was turned back on.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
(port to oem-5.6)
Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
---
 debian.master/config/config.common.ubuntu | 2 ++
 debian.oem/config/config.common.ubuntu    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9b2dc885dd3d2..8712be5f512ef 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -768,6 +768,7 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_AS3935=m
 CONFIG_ASHMEM=m
+CONFIG_ASM_MODVERSIONS=y
 CONFIG_ASN1=y
 CONFIG_ASPEED_ADC=m
 CONFIG_ASPEED_BT_IPMI_BMC=m
@@ -5910,6 +5911,7 @@ CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_REL_CRCS=y
 CONFIG_MODULE_SIG=y
 CONFIG_MODULE_SIG_ALL=y
 # CONFIG_MODULE_SIG_FORCE is not set
diff --git a/debian.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu
index 96d4090de62f5..41394ac36e7e9 100644
--- a/debian.oem/config/config.common.ubuntu
+++ b/debian.oem/config/config.common.ubuntu
@@ -368,6 +368,7 @@ CONFIG_ARCNET_RAW=m
 CONFIG_ARCNET_RIM_I=m
 CONFIG_AS3935=m
 CONFIG_ASHMEM=m
+CONFIG_ASM_MODVERSIONS=y
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_ASUS_LAPTOP=m