From: Greg Kroah-Hartman Date: Mon, 25 Jul 2016 01:03:24 +0000 (-0700) Subject: 4.4-stable patches X-Git-Tag: v4.6.5~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e8b6353f525b0fe06f728161236ca460a20fd13;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch --- diff --git a/queue-4.4/crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch b/queue-4.4/crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch new file mode 100644 index 00000000000..513167146a2 --- /dev/null +++ b/queue-4.4/crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch @@ -0,0 +1,32 @@ +From 81dc0365cfa7bc7c08a0e44d9ee04964df782e19 Mon Sep 17 00:00:00 2001 +From: Jan Stancek +Date: Thu, 30 Jun 2016 12:23:51 +0200 +Subject: crypto: qat - make qat_asym_algs.o depend on asn1 headers + +From: Jan Stancek + +commit 81dc0365cfa7bc7c08a0e44d9ee04964df782e19 upstream. + +Parallel build can sporadically fail because asn1 headers may +not be built yet by the time qat_asym_algs.o is compiled: + drivers/crypto/qat/qat_common/qat_asym_algs.c:55:32: fatal error: qat_rsapubkey-asn1.h: No such file or directory + #include "qat_rsapubkey-asn1.h" + +Signed-off-by: Jan Stancek +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/crypto/qat/qat_common/Makefile | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/crypto/qat/qat_common/Makefile ++++ b/drivers/crypto/qat/qat_common/Makefile +@@ -2,6 +2,7 @@ $(obj)/qat_rsapubkey-asn1.o: $(obj)/qat_ + $(obj)/qat_rsapubkey-asn1.h + $(obj)/qat_rsaprivkey-asn1.o: $(obj)/qat_rsaprivkey-asn1.c \ + $(obj)/qat_rsaprivkey-asn1.h ++$(obj)/qat_asym_algs.o: $(obj)/qat_rsapubkey-asn1.h $(obj)/qat_rsaprivkey-asn1.h + + clean-files += qat_rsapubkey-asn1.c qat_rsapubkey-asn1.h + clean-files += qat_rsaprivkey-asn1.c qat_rsapvivkey-asn1.h diff --git a/queue-4.4/series b/queue-4.4/series index a6a1f464543..51057798ae8 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -139,3 +139,4 @@ fix-reconnect-to-not-defer-smb3-session-reconnect-long-after-socket-reconnect.pa cifs-dynamic-allocation-of-ntlmssp-blob.patch file-names-with-trailing-period-or-space-need-special-case-conversion.patch xen-acpi-allow-xen-acpi-processor-driver-to-load-on-xen-4.7.patch +crypto-qat-make-qat_asym_algs.o-depend-on-asn1-headers.patch