diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-01 18:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 18:01:10 +0000 |
| commit | ef41cdba6c2d52a449bbccfebefa87a2da05ed3f (patch) | |
| tree | a5070b48fbdb2b4d08031937c2abe419f7576f27 /pkgs/os-specific | |
| parent | eeca5969b3f42ac943639aaec503816f053e5e53 (diff) | |
| parent | 04f7dcbc66fe880689287a20e64d9598a9800d57 (diff) | |
| download | nixpkgs-ef41cdba6c2d52a449bbccfebefa87a2da05ed3f.tar nixpkgs-ef41cdba6c2d52a449bbccfebefa87a2da05ed3f.tar.gz nixpkgs-ef41cdba6c2d52a449bbccfebefa87a2da05ed3f.tar.bz2 nixpkgs-ef41cdba6c2d52a449bbccfebefa87a2da05ed3f.tar.lz nixpkgs-ef41cdba6c2d52a449bbccfebefa87a2da05ed3f.tar.xz nixpkgs-ef41cdba6c2d52a449bbccfebefa87a2da05ed3f.tar.zst nixpkgs-ef41cdba6c2d52a449bbccfebefa87a2da05ed3f.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -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 aff6c15dc22..4fb1e83917a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -551,7 +551,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? |