diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-02-13 12:16:39 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-02-13 12:16:39 +0100 |
| commit | 4af79a73316981a7ba96cfa9501ab210f589a2a8 (patch) | |
| tree | 35bd55e61f7a43e63a7a96f8c483784d2ad96572 /pkgs | |
| parent | af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0 (diff) | |
| download | nixlib-4af79a73316981a7ba96cfa9501ab210f589a2a8.tar nixlib-4af79a73316981a7ba96cfa9501ab210f589a2a8.tar.gz nixlib-4af79a73316981a7ba96cfa9501ab210f589a2a8.tar.bz2 nixlib-4af79a73316981a7ba96cfa9501ab210f589a2a8.tar.lz nixlib-4af79a73316981a7ba96cfa9501ab210f589a2a8.tar.xz nixlib-4af79a73316981a7ba96cfa9501ab210f589a2a8.tar.zst nixlib-4af79a73316981a7ba96cfa9501ab210f589a2a8.zip | |
Revert "linux: Apply 9p veryloose patch to 4.9"
This reverts commit a82810c7a7e62848b75739b1cccddca8f1363c75. Fixes #22695.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ea93815e7861..1f528f9412be 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -175,12 +175,12 @@ rec { }; }; - p9_caching_4_9 = rec + p9_caching_4_4 = rec { name = "9p-caching.patch"; patch = fetchpatch { inherit name; - url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch; - sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a"; + url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch; + sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 855de099cbac..0bd5f1e490d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11282,6 +11282,7 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" + kernelPatches.p9_caching_4_4 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ 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 # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long - kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11311,7 +11311,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill |