From 9be9b726f4b57814f67b58e860aec7cae2c18675 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 21 May 2023 23:42:12 +0200 Subject: [PATCH] linux_testing: 6.4-rc2 -> 6.4-rc3 Dropped the Maple state patch as it is already applied now. --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- pkgs/top-level/linux-kernels.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6736dd18cdc2..d01d9d4d78e5 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.4-rc2"; + version = "6.4-rc3"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchzip { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-CQwSN5LQxGO900QLMAXcjGhB2o+6rZgXHQ+gCJtVaeU="; + hash = "sha256-twGP2zNNkxJy32wCCMlkGtV1xco05FeW2s3wljwB1eM="; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 59678b6bab2f..bbaf6f183f69 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -208,7 +208,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.make-maple-state-reusable-after-mas_empty_area ]; }; latest = packageAliases.linux_latest.kernel;