diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-11-01 15:07:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 15:07:19 +0000 |
| commit | c3033dafb0ee623203adcb72cdfa64fb8341d484 (patch) | |
| tree | aaa0878c0afa78f259339a756e43f17f436850ec /pkgs/os-specific/linux | |
| parent | 6739decba3546cf6911f056fb38998da386271cd (diff) | |
| parent | cce5b627399e5224246f54bfce4cbeeb6c907a21 (diff) | |
| download | nixpkgs-c3033dafb0ee623203adcb72cdfa64fb8341d484.tar nixpkgs-c3033dafb0ee623203adcb72cdfa64fb8341d484.tar.gz nixpkgs-c3033dafb0ee623203adcb72cdfa64fb8341d484.tar.bz2 nixpkgs-c3033dafb0ee623203adcb72cdfa64fb8341d484.tar.lz nixpkgs-c3033dafb0ee623203adcb72cdfa64fb8341d484.tar.xz nixpkgs-c3033dafb0ee623203adcb72cdfa64fb8341d484.tar.zst nixpkgs-c3033dafb0ee623203adcb72cdfa64fb8341d484.zip | |
Merge pull request #198783 from aacebedo/linux-testing_6.1_rc3
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3c1bbb73fda..bf6014056ed 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -550,7 +550,7 @@ let CGROUP_RDMA = whenAtLeast "4.11" yes; MEMCG = yes; - MEMCG_SWAP = yes; + MEMCG_SWAP = whenOlder "6.1" yes; BLK_DEV_THROTTLING = yes; CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1 diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3d07fd3175b..2e07f957efe 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.0-rc5"; + version = "6.1-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 = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-GELU1ZEOM5gGUJxG54JoiI9qLQXJ2Cd/kyOLcp0AWgc="; + hash = "sha256-qz863wvIe/JJjqSYoxxbt+2xTqgNNZJpAfWr8nG8wKk="; }; # Should the testing kernels ever be built on Hydra? |