summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-12-11 11:29:49 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-12-11 11:31:05 +0100
commitfc6d1471ce114dc91085b68337535ea83ca56682 (patch)
tree9a59fa80aa11256a90be70aee0a5d5a8d1d68f63 /pkgs/os-specific/linux/kernel
parentffb72182a6f24f1da90961f34450ee66c2680a61 (diff)
downloadnixpkgs-fc6d1471ce114dc91085b68337535ea83ca56682.tar
nixpkgs-fc6d1471ce114dc91085b68337535ea83ca56682.tar.gz
nixpkgs-fc6d1471ce114dc91085b68337535ea83ca56682.tar.bz2
nixpkgs-fc6d1471ce114dc91085b68337535ea83ca56682.tar.lz
nixpkgs-fc6d1471ce114dc91085b68337535ea83ca56682.tar.xz
nixpkgs-fc6d1471ce114dc91085b68337535ea83ca56682.tar.zst
nixpkgs-fc6d1471ce114dc91085b68337535ea83ca56682.zip
linux-testing: Revert build fix for -rc3.
This reverts commit 79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415.

The commit was from an upstream commit anyway and has since been applied
to mainline.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing.nix9
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 5006f0519eb..54ad2183382 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -19,13 +19,4 @@ import ./generic.nix (args // rec {
   # Should the testing kernels ever be built on Hydra?
   extraMeta.hydraPlatforms = [];
 
-  kernelPatches = stdenv.lib.singleton {
-    name = "fix-depmod-cycle";
-    patch = fetchurl {
-      name = "lustre-remove-IOC_LIBCFS_PING_TEST-ioctl.patch";
-      url = "https://lkml.org/lkml/diff/2015/11/6/987/1";
-      sha256 = "0ja9103f4s65fyn5b6z6lggplnm97hhz4rmpfn4m985yqw7zgihd";
-    };
-  };
-
 } // (args.argsOverride or {}))