public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "linux: Apply 9p veryloose patch to 4.9"

Browse Source 
This reverts commit a82810c7a7.

Fixes #22695.
This commit is contained in:
Eelco Dolstra
2017-02-13 12:16:39 +01:00
parent af3732b6c6
commit 4af79a7331
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/patches.nix
+3 -3
View File
@@ -175,12 +175,12 @@ rec {
}; };
}; };
p9_caching_4_9 = rec p9_caching_4_4 = rec
{ name = "9p-caching.patch"; { name = "9p-caching.patch";
patch = fetchpatch { patch = fetchpatch {
inherit name; inherit name;
url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch; url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a"; sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
}; };
}; };
pkgs/top-level/all-packages.nix
+1 -2
View File
@@ -11282,6 +11282,7 @@ with pkgs;
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.cpu-cgroup-v2."4.4" kernelPatches.cpu-cgroup-v2."4.4"
kernelPatches.p9_caching_4_4
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
@@ -11298,7 +11299,6 @@ with pkgs;
# !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
# kernelPatches.cpu-cgroup-v2."4.7" # kernelPatches.cpu-cgroup-v2."4.7"
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.p9_caching_4_9
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
@@ -11311,7 +11311,6 @@ with pkgs;
kernelPatches = [ kernelPatches = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
kernelPatches.p9_caching_4_9
] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
kernelPatches.mips_fpureg_emu kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill kernelPatches.mips_fpu_sigill