UBUNTU: [Config] CONFIG_CRYPTO_DEV_VMX=n

BugLink: http://bugs.launchpad.net/bugs/1666483
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 6e5443f1bfd4882f5e2a060d153da9053be98c03..d6b634156d39612a9f993350610f778db0c9a1a2 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -434,11 +434,13 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCCVF                policy<{'amd64': 'm', 'i386': 'm
 CONFIG_CRYPTO_DEV_QAT_C3XXXVF                   policy<{'amd64': 'n', 'i386': 'n'}>
 CONFIG_CRYPTO_DEV_QAT_C62XVF                    policy<{'amd64': 'n', 'i386': 'n'}>
 CONFIG_CRYPTO_DEV_QCE                           policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_CRYPTO_DEV_VMX                           policy<{'powerpc-generic': 'y', 'ppc64el': 'y'}>
+CONFIG_CRYPTO_DEV_VMX                           policy<{'powerpc-generic': 'n', 'ppc64el': 'n'}>
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT                   policy<{'powerpc-generic': 'm', 'ppc64el': 'm'}>
 CONFIG_CRYPTO_DEV_ROCKCHIP                      policy<{'armhf': 'n'}>
 CONFIG_CRYPTO_DEV_CHELSIO                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_CRYPTO_DEV_VIRTIO                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+#
+CONFIG_CRYPTO_DEV_VMX                          mark<ENFORCED> note <LP #1666483>
 
 # Menu: Cryptographic API >> Hardware crypto devices >> Freescale CAAM Job Ring driver backend
 CONFIG_CRYPTO_DEV_FSL_CAAM_JR                   policy<{'arm64': 'm', 'armhf-generic': 'm', 'powerpc-powerpc64-emb': 'm', 'powerpc-powerpc-e500mc': 'm'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a64cfe166ac65e547644c4855386970a6739ffae..8e99af723aa3812535f53e5149724359f661bc53 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1739,8 +1739,7 @@ CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_TALITOS=m
 CONFIG_CRYPTO_DEV_TALITOS2=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
+# CONFIG_CRYPTO_DEV_VMX is not set
 CONFIG_CRYPTO_DH=m
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_CTR=y