From 51126c89d5a34fd8f048557615a088d9df674808 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Oct 2025 19:40:16 +0300 Subject: [PATCH 1/9] linux_6_17: init at 6.17 --- pkgs/os-specific/linux/kernel/kernels-org.json | 5 +++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 1484ecee6cc9..de87d1b4b233 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -38,5 +38,10 @@ "version": "6.16.9", "hash": "sha256:13g59jvc6kvp8dzl6ysmzrpq4nh9xvy5va5avrsn6iq5ryiwij3s", "lts": false + }, + "6.17": { + "version": "6.17", + "hash": "sha256:19spyyknps9dzb6mz5sk685a505hzqi144lqc0rdi6f9l5k72q4v", + "lts": false } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5f685ed79471..a24794276123 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1418,6 +1418,7 @@ mapAliases { linuxPackages_6_14 = linuxKernel.packages.linux_6_14; linuxPackages_6_15 = linuxKernel.packages.linux_6_15; linuxPackages_6_16 = linuxKernel.packages.linux_6_16; + linuxPackages_6_17 = linuxKernel.packages.linux_6_17; linuxPackages_ham = linuxKernel.packages.linux_ham; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -1443,6 +1444,7 @@ mapAliases { linux_6_14 = linuxKernel.kernels.linux_6_14; linux_6_15 = linuxKernel.kernels.linux_6_15; linux_6_16 = linuxKernel.kernels.linux_6_16; + linux_6_17 = linuxKernel.kernels.linux_6_17; linux_ham = linuxKernel.kernels.linux_ham; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 1faba9a7f1b5..9e76135f3b81 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -218,6 +218,14 @@ in ]; }; + linux_6_17 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.17"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { @@ -737,6 +745,7 @@ in linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16); + linux_6_17 = recurseIntoAttrs (packagesFor kernels.linux_6_17); } // lib.optionalAttrs config.allowAliases { linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 @@ -809,7 +818,7 @@ in packageAliases = { linux_default = packages.linux_6_12; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_16; + linux_latest = packages.linux_6_17; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; } From 49965bf1fcd6a65c8ecd50a203bbcbfbc59a24bb Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Oct 2025 19:40:20 +0300 Subject: [PATCH 2/9] linux_6_16: 6.16.9 -> 6.16.10 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index de87d1b4b233..1f92970dafa7 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -35,8 +35,8 @@ "lts": true }, "6.16": { - "version": "6.16.9", - "hash": "sha256:13g59jvc6kvp8dzl6ysmzrpq4nh9xvy5va5avrsn6iq5ryiwij3s", + "version": "6.16.10", + "hash": "sha256:1wm8azbwy131cwvxab66v2ccybfkaq7gkxili0p6hjqyhnlbn1mb", "lts": false }, "6.17": { From 4b8ec043d78ae3eb296bd23fcfe9c03ff5fc5bb9 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Oct 2025 19:40:24 +0300 Subject: [PATCH 3/9] linux_6_12: 6.12.49 -> 6.12.50 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 1f92970dafa7..28da898cf967 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,8 +30,8 @@ "lts": true }, "6.12": { - "version": "6.12.49", - "hash": "sha256:09jm892q3b275liyzmycczg6nyjg1ramsma920jf5k6s8vhj2ii3", + "version": "6.12.50", + "hash": "sha256:19bjzhxasj4r6m1lhsa486a96axfigbm06kqa2lwa7y2s5sbsdf4", "lts": true }, "6.16": { From efc34f1990b7a72a24fc1c51fb24df5cdc1e2647 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Oct 2025 19:40:28 +0300 Subject: [PATCH 4/9] linux_6_6: 6.6.108 -> 6.6.109 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 28da898cf967..e6acbceb886e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,8 +25,8 @@ "lts": true }, "6.6": { - "version": "6.6.108", - "hash": "sha256:19k834gd9galmzl7gq0v25nv785ld7ryygrmgdh1cpb9m8rd6730", + "version": "6.6.109", + "hash": "sha256:1x1h2x04xvds8k59x36zqxzbj4cm6yl5l6xacgfyxzccfycwscbp", "lts": true }, "6.12": { From 90c4a3eaa4b5a66adf155c99808fb2a71fe26f03 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Oct 2025 19:40:33 +0300 Subject: [PATCH 5/9] linux_6_1: 6.1.154 -> 6.1.155 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e6acbceb886e..b7633326d0e5 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,8 +5,8 @@ "lts": false }, "6.1": { - "version": "6.1.154", - "hash": "sha256:165im36dhnvhrfkn4x77ds6cgisn40d1cwxvxsci5lnhqf9bl6kg", + "version": "6.1.155", + "hash": "sha256:0wsw99h2jsrcx9fff59nqjx66l40vywj8qi3j6yvqpq8xsp8g4y2", "lts": true }, "5.15": { From dca42db029bdd338162297671a965b24d440e0f0 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Oct 2025 19:40:38 +0300 Subject: [PATCH 6/9] linux_5_15: 5.15.193 -> 5.15.194 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b7633326d0e5..f9fb0ede9afe 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -10,8 +10,8 @@ "lts": true }, "5.15": { - "version": "5.15.193", - "hash": "sha256:168ymh51hm0l6pd9g2kc33ji28gznc25rwzj7rvhnw82z79640n7", + "version": "5.15.194", + "hash": "sha256:0zi6ihvjmaf940arnc7jjvdqrjf3cvkc9mqc8n24dz85vam6z39l", "lts": true }, "5.10": { From a4ffd4b89b5bf40e32f39e4df9c27ce28878a472 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Oct 2025 19:40:41 +0300 Subject: [PATCH 7/9] linux_5_10: 5.10.244 -> 5.10.245 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f9fb0ede9afe..6cb0e85cbfa9 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -15,8 +15,8 @@ "lts": true }, "5.10": { - "version": "5.10.244", - "hash": "sha256:1h3dqaran5zrfgs0vybwq576yka8s9jirahiy3bb7hpm1763f2i1", + "version": "5.10.245", + "hash": "sha256:17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk", "lts": true }, "5.4": { From 8d5a8714581503810a4c7d97527a778de7cf961b Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Oct 2025 19:40:45 +0300 Subject: [PATCH 8/9] linux_5_4: 5.4.299 -> 5.4.300 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 6cb0e85cbfa9..e8a9ccebb473 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "lts": true }, "5.4": { - "version": "5.4.299", - "hash": "sha256:0bdzy3bpywm24nx73ah9smwmmlmyhvlf5xcp2kk1z54dxfp9bpl8", + "version": "5.4.300", + "hash": "sha256:0nl1l689d4jq2l39v816yy7z5lzc5dvv8aqn85xlv4najc022jcr", "lts": true }, "6.6": { From 1cbf73ede49e2ca21ad161d0394ef49d697a92f7 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Oct 2025 19:55:06 +0300 Subject: [PATCH 9/9] linux/common-config: enable nice things for 6.17 --- pkgs/os-specific/linux/kernel/common-config.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e5016ccb87fa..3f7f485ac87d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -230,6 +230,7 @@ let DAMON_DBGFS = whenBetween "5.15" "6.9" yes; DAMON_RECLAIM = whenAtLeast "5.16" yes; DAMON_LRU_SORT = whenAtLeast "6.0" yes; + DAMON_STAT = whenAtLeast "6.17" yes; # Support recovering from memory failures on systems with ECC and MCA recovery. MEMORY_FAILURE = yes; @@ -1475,6 +1476,9 @@ let # See https://cateee.net/lkddb/web-lkddb/AMD_WBRF.html AMD_WBRF = whenAtLeast "6.8" yes; + # Enable AMD heterogeneous core hardware feedback interface + AMD_HFI = whenAtLeast "6.17" yes; + # Enable Intel Turbo Boost Max 3.0 INTEL_TURBO_MAX_3 = yes; };