pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #198783 from aacebedo/linux-testing_6.1_rc3

authored by Bernardo Meurer and committed by GitHub c3033daf 6739decb

+3 -3
unified split
+1 -1
pkgs/os-specific/linux/kernel/common-config.nix
··· 550 CGROUP_RDMA = whenAtLeast "4.11" yes; 551 552 MEMCG = yes; 553 - MEMCG_SWAP = yes; 554 555 BLK_DEV_THROTTLING = yes; 556 CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1
··· 550 CGROUP_RDMA = whenAtLeast "4.11" yes; 551 552 MEMCG = yes; 553 + MEMCG_SWAP = whenOlder "6.1" yes; 554 555 BLK_DEV_THROTTLING = yes; 556 CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1
+2 -2
pkgs/os-specific/linux/kernel/linux-testing.nix
··· 3 with lib; 4 5 buildLinux (args // rec { 6 - version = "6.0-rc5"; 7 extraMeta.branch = lib.versions.majorMinor version; 8 9 # modDirVersion needs to be x.y.z, will always add .0 ··· 11 12 src = fetchurl { 13 url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; 14 - hash = "sha256-GELU1ZEOM5gGUJxG54JoiI9qLQXJ2Cd/kyOLcp0AWgc="; 15 }; 16 17 # Should the testing kernels ever be built on Hydra?
··· 3 with lib; 4 5 buildLinux (args // rec { 6 + version = "6.1-rc3"; 7 extraMeta.branch = lib.versions.majorMinor version; 8 9 # modDirVersion needs to be x.y.z, will always add .0 ··· 11 12 src = fetchurl { 13 url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; 14 + hash = "sha256-qz863wvIe/JJjqSYoxxbt+2xTqgNNZJpAfWr8nG8wKk="; 15 }; 16 17 # Should the testing kernels ever be built on Hydra?