drop 4.14 patch that wasn't being applied.

diff --git a/queue-4.14/crypto-x86-aegis-morus-do-not-require-osxsave-for-sse2.patch b/queue-4.14/crypto-x86-aegis-morus-do-not-require-osxsave-for-sse2.patch
deleted file mode 100644 (file)
index 7302b73..0000000
--- a/queue-4.14/crypto-x86-aegis-morus-do-not-require-osxsave-for-sse2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 24568b47d48ec8c906fd0f589489a08b17e1edca Mon Sep 17 00:00:00 2001
-From: Ondrej Mosnacek <omosnace@redhat.com>
-Date: Wed, 5 Sep 2018 09:26:41 +0200
-Subject: crypto: x86/aegis,morus - Do not require OSXSAVE for SSE2
-
-From: Ondrej Mosnacek <omosnace@redhat.com>
-
-commit 24568b47d48ec8c906fd0f589489a08b17e1edca upstream.
-
-It turns out OSXSAVE needs to be checked only for AVX, not for SSE.
-Without this patch the affected modules refuse to load on CPUs with SSE2
-but without AVX support.
-
-Fixes: 877ccce7cbe8 ("crypto: x86/aegis,morus - Fix and simplify CPUID checks")
-Cc: <stable@vger.kernel.org> # 4.18
-Reported-by: Zdenek Kaspar <zkaspar82@gmail.com>
-Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/arch/x86/crypto/aegis128-aesni-glue.c b/arch/x86/crypto/aegis128-aesni-glue.c
-index acd11b3bf639..2a356b948720 100644
---- a/arch/x86/crypto/aegis128-aesni-glue.c
-+++ b/arch/x86/crypto/aegis128-aesni-glue.c
-@@ -379,7 +379,6 @@ static int __init crypto_aegis128_aesni_module_init(void)
- {
-       if (!boot_cpu_has(X86_FEATURE_XMM2) ||
-           !boot_cpu_has(X86_FEATURE_AES) ||
--          !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
-           !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
-               return -ENODEV;
- 
-diff --git a/arch/x86/crypto/aegis128l-aesni-glue.c b/arch/x86/crypto/aegis128l-aesni-glue.c
-index 2071c3d1ae07..dbe8bb980da1 100644
---- a/arch/x86/crypto/aegis128l-aesni-glue.c
-+++ b/arch/x86/crypto/aegis128l-aesni-glue.c
-@@ -379,7 +379,6 @@ static int __init crypto_aegis128l_aesni_module_init(void)
- {
-       if (!boot_cpu_has(X86_FEATURE_XMM2) ||
-           !boot_cpu_has(X86_FEATURE_AES) ||
--          !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
-           !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
-               return -ENODEV;
- 
-diff --git a/arch/x86/crypto/aegis256-aesni-glue.c b/arch/x86/crypto/aegis256-aesni-glue.c
-index b5f2a8fd5a71..8bebda2de92f 100644
---- a/arch/x86/crypto/aegis256-aesni-glue.c
-+++ b/arch/x86/crypto/aegis256-aesni-glue.c
-@@ -379,7 +379,6 @@ static int __init crypto_aegis256_aesni_module_init(void)
- {
-       if (!boot_cpu_has(X86_FEATURE_XMM2) ||
-           !boot_cpu_has(X86_FEATURE_AES) ||
--          !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
-           !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
-               return -ENODEV;
- 
-diff --git a/arch/x86/crypto/morus1280-sse2-glue.c b/arch/x86/crypto/morus1280-sse2-glue.c
-index 95cf857d2cbb..f40244eaf14d 100644
---- a/arch/x86/crypto/morus1280-sse2-glue.c
-+++ b/arch/x86/crypto/morus1280-sse2-glue.c
-@@ -40,7 +40,6 @@ MORUS1280_DECLARE_ALGS(sse2, "morus1280-sse2", 350);
- static int __init crypto_morus1280_sse2_module_init(void)
- {
-       if (!boot_cpu_has(X86_FEATURE_XMM2) ||
--          !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
-           !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
-               return -ENODEV;
- 
-diff --git a/arch/x86/crypto/morus640-sse2-glue.c b/arch/x86/crypto/morus640-sse2-glue.c
-index 615fb7bc9a32..9afaf8f8565a 100644
---- a/arch/x86/crypto/morus640-sse2-glue.c
-+++ b/arch/x86/crypto/morus640-sse2-glue.c
-@@ -40,7 +40,6 @@ MORUS640_DECLARE_ALGS(sse2, "morus640-sse2", 400);
- static int __init crypto_morus640_sse2_module_init(void)
- {
-       if (!boot_cpu_has(X86_FEATURE_XMM2) ||
--          !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
-           !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
-               return -ENODEV;
- 

diff --git a/queue-4.14/series b/queue-4.14/series
index 99d88334b5d8465e5914373268205387ccaa0d75..28a83343ba88ca17e55d10aa31928de91f972438 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -61,4 +61,3 @@ pci-aardvark-size-bridges-before-resources-allocation.patch
 vmw_balloon-include-asm-io.h.patch
 iw_cxgb4-only-allow-1-flush-on-user-qps.patch
 tick-nohz-prevent-bogus-softirq-pending-warning.patch
-crypto-x86-aegis-morus-do-not-require-osxsave-for-sse2.patch