From 2b35a6bd33e4b54864683c52a2711314e58cd9ff Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Wed, 23 Oct 2024 11:56:04 +0100 Subject: [PATCH 1/3] linuxKernel.kernels.linux_zen: 6.11.2-zen1 -> v6.11.5-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index afca9bb2a44e..65988d74359c 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,9 +5,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.11.2"; #zen + version = "6.11.5"; #zen suffix = "zen1"; #zen - sha256 = "1pwhdx8dcih0q3xj2hndd9vmz1xclrp4dw9yk0p1hi03mb634s40"; #zen + sha256 = "1w342k54ns6rwkk13l9f7h0qzikn6hbnb2ydxyqalrmll8n2g237"; #zen isLqx = false; }; # ./update-zen.py lqx From d0037e9629d95b367202b9c7872f502f66d9c023 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Wed, 23 Oct 2024 11:58:30 +0100 Subject: [PATCH 2/3] linuxKernel.kernels.linux_lqx: 6.11.2-lqx1 -> v6.11.5-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 65988d74359c..5f222cae02fa 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,9 +12,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.11.2"; #lqx + version = "6.11.5"; #lqx suffix = "lqx1"; #lqx - sha256 = "0q5zdzb26azshn1n8fc5zy5n2sa7sz3q4khkjivafz6pyli1wfl8"; #lqx + sha256 = "0ql7nw6sph4ai44n66c7l06aj4ibhdy45415yzgibin1jg9rqa6d"; #lqx isLqx = true; }; }; From ff63c60b99868cee5b883cd2d0d5a74594fe6edb Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Wed, 23 Oct 2024 13:05:11 +0100 Subject: [PATCH 3/3] linuxKernel.kernels.linux_zen: remove deprecated config opts re: `Z3FOLD` --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 5f222cae02fa..f4eda83e6f64 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -83,8 +83,6 @@ let HZ = freeform "1000"; HZ_1000 = yes; - # Alternative zpool for zswap - Z3FOLD = yes; } // lib.optionalAttrs (isLqx) { # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; @@ -101,7 +99,6 @@ let # Swap storage is compressed with LZ4 using zswap ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes; ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no; - ZSWAP_ZPOOL_DEFAULT_Z3FOLD = yes; # Fix error: unused option: XXX. CFS_BANDWIDTH = lib.mkForce (option no);