From 2e891693f2d429e1f54b224619038cfc4659271d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 13 Nov 2023 12:14:11 +0100
Subject: 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.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 -
 pkgs/os-specific/linux/kernel/kernels-org.json  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'pkgs/os-specific/linux')

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",
-- 
cgit 1.4.1