diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-01-24 11:37:35 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-01-24 13:05:02 +0100 |
| commit | a82810c7a7e62848b75739b1cccddca8f1363c75 (patch) | |
| tree | fdd75435263b3ca847b55e451917f99efb318ffe /pkgs | |
| parent | b3b300b6ff1353008f42cf1b65d8d8ea0e0c5a36 (diff) | |
| download | nixlib-a82810c7a7e62848b75739b1cccddca8f1363c75.tar nixlib-a82810c7a7e62848b75739b1cccddca8f1363c75.tar.gz nixlib-a82810c7a7e62848b75739b1cccddca8f1363c75.tar.bz2 nixlib-a82810c7a7e62848b75739b1cccddca8f1363c75.tar.lz nixlib-a82810c7a7e62848b75739b1cccddca8f1363c75.tar.xz nixlib-a82810c7a7e62848b75739b1cccddca8f1363c75.tar.zst nixlib-a82810c7a7e62848b75739b1cccddca8f1363c75.zip | |
linux: Apply 9p veryloose patch to 4.9
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, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 42a6e0d037b9..ec114f93e83f 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_4 = rec + p9_caching_4_9 = rec { name = "9p-caching.patch"; patch = fetchpatch { inherit name; - url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch; - sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2"; + url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch; + sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d2b4cf52014..ac59998dde4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11243,7 +11243,6 @@ in 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 @@ -11260,6 +11259,7 @@ in # !!! 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 @@ -11272,6 +11272,7 @@ in 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 |