From b2efe2babd741e9fb07078f0ddf828e5af63cefa Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 12 Aug 2016 16:41:42 +0100
Subject: [PATCH] Revert "linux kernel 4.4: fix race during build"
Removes patch. Was fixed upstream.
This reverts commit 4788ec13725f9bcab65212057e54215d10d4ee62.
---
pkgs/os-specific/linux/kernel/patches.nix | 4 ----
.../os-specific/linux/kernel/qat_common_Makefile.patch | 10 ----------
pkgs/top-level/all-packages.nix | 1 -
3 files changed, 15 deletions(-)
delete mode 100644 pkgs/os-specific/linux/kernel/qat_common_Makefile.patch
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 56963d89efa..f0aa4c92b3c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -136,10 +136,6 @@ rec {
{ name = "mfd_fix_dependency";
patch = ./chromiumos-patches/mfd-fix-dependency.patch;
};
- qat_common_Makefile =
- { name = "qat_common_Makefile";
- patch = ./qat_common_Makefile.patch;
- };
hiddev_CVE_2016_5829 =
{ name = "hiddev_CVE_2016_5829";
diff --git a/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch b/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch
deleted file mode 100644
index 2d4476a7fe5..00000000000
--- a/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/crypto/qat/qat_common/Makefile
-+++ b/drivers/crypto/qat/qat_common/Makefile
-@@ -2,6 +2,7 @@
- $(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_rsaprivkey-asn1.h $(obj)/qat_rsapubkey-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/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4be6ba3e37..f226e3dd0d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11151,7 +11151,6 @@ in
linux_4_5 = callPackage ../os-specific/linux/kernel/linux-4.5.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
- kernelPatches.qat_common_Makefile
kernelPatches.hiddev_CVE_2016_5829
]
++ lib.optionals ((platform.kernelArch or null) == "mips")