diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-13 12:14:11 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-13 15:33:39 +0100 |
| commit | 2e891693f2d429e1f54b224619038cfc4659271d (patch) | |
| tree | f3acc17d93f27a621c94281278ff341a049e148f /pkgs/os-specific | |
| parent | ee137e017ce5c73113f83506f588d3e2cdbce95d (diff) | |
| download | nixpkgs-2e891693f2d429e1f54b224619038cfc4659271d.tar nixpkgs-2e891693f2d429e1f54b224619038cfc4659271d.tar.gz nixpkgs-2e891693f2d429e1f54b224619038cfc4659271d.tar.bz2 nixpkgs-2e891693f2d429e1f54b224619038cfc4659271d.tar.lz nixpkgs-2e891693f2d429e1f54b224619038cfc4659271d.tar.xz nixpkgs-2e891693f2d429e1f54b224619038cfc4659271d.tar.zst nixpkgs-2e891693f2d429e1f54b224619038cfc4659271d.zip | |
linux_testing: 6.6-rc7 -> 6.7-rc1
ZSMALLOC is now the default allocator for ZSWAP, so if the allocator isn't changed, ZSMALLOC must be y on 6.7 (and will default to that). The script will set all options that can be modules to m anyway, so there was no need for us to be explicitly setting it to module before anyway.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/kernels-org.json | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1aedcdc7c0f..1ce9aa72a48 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -722,7 +722,6 @@ let ZSWAP = option yes; ZPOOL = yes; ZBUD = option yes; - ZSMALLOC = module; }; brcmfmac = { diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index aeb6bbb2720..5201a4248f8 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.6-rc7", - "hash": "sha256:1zzd32ya4hldfywicgpnc2cyd412s7q9c31qvxx2nl9nkx11xsxv" + "version": "6.7-rc1", + "hash": "sha256:1a071vvmm08sp48d0arqzcmqnz5xdb1vflfhxcqwmpzaabjrgadk" }, "6.5": { "version": "6.5.11", |