diff options
author | Tim Steinbach <tim@nequissimus.com> | 2021-01-11 11:10:07 -0500 |
---|---|---|
committer | Tim Steinbach <tim@nequissimus.com> | 2021-01-11 11:10:07 -0500 |
commit | 18b09d883fba77b433afce33da8bb2c25344f21a (patch) | |
tree | f078fdcf5967fb01444ae2f7ab56c8f4fd8e8d6e | |
parent | d91f1b0f476cce63c5b4ce4024f848c119156503 (diff) |
linux: 5.11-rc2 -> 5.11-rc3
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6cf74a504a1a0..c18d75b93f20f 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.11-rc2"; + version = "5.11-rc3"; extraMeta.branch = "5.11"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "092jgmzqfpylwbwhv7j8hy5y0ai14b6wm7p7vw6pxj7alixyynq0"; + sha256 = "15dfgvicp7s9xqaa3w8lmfffzyjsqrq1fa2gs1a8awzs5rxgsn61"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a1a6900071047..6b1568013b920 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -105,14 +105,4 @@ name = "mac_nvme_t2"; patch = ./mac-nvme-t2.patch; }; - - # https://lkml.org/lkml/2020/12/18/461 - wireless_syntax_error = rec { - name = "wireless-syntax_error"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://lkml.org/lkml/diff/2020/12/18/461/1"; - sha256 = "11rnw9z7311crsx37sk68b71q51cni70lzf40ildqjnnn71m3q58"; - }; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2950c3d771b47..b080f3d3b819e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18790,7 +18790,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.wireless_syntax_error ]; }; |