UBUNTU: [Config] Update configs for v4.13.5

BugLink: http://bugs.launchpad.net/bugs/1721777
Changes in the 4.13.5 stable update caused a couple of crypto
modules to become built-in. Run updateconfigs to reflect this and
ignore these modules in the abi check.

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

diff --git a/debian.master/abi/4.13.0-16.19/modules.ignore b/debian.master/abi/4.13.0-16.19/modules.ignore
new file mode 100644 (file)
index 0000000..e0630a6
--- /dev/null
+++ b/debian.master/abi/4.13.0-16.19/modules.ignore
@@ -0,0 +1,2 @@
+gcm
+ghash-generic

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ec9ec986291dc2a43f52c1e0c09b5837918cd19f..7ad590d311f09c7b2162094aaeaaac10b5768267 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1825,9 +1825,9 @@ CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ENGINE=m
 CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH_ARM_CE=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m