From 9f3834f9213d5c6b3df66c6be9a81bda55f17a41 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Aug 2025 18:20:33 +0300 Subject: [PATCH 1/7] linux_testing: 6.16-rc7 -> 6.17-rc1 --- 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 2679c02e760f..90833b9e66cc 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.16-rc7", - "hash": "sha256:071xwskg7rpa6j09khdxzzccqp8a2fk68l0p2bn7ycr51pyywxz9" + "version": "6.17-rc1", + "hash": "sha256:0dilsyjyx06b5f9wln6i58xi6nja2g5pj9p2kclfqqhbrgzxkyfl" }, "6.1": { "version": "6.1.147", From 2ac7c3cef1ad32e81f59fc61c181dec1d0ddc9f0 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Aug 2025 18:20:39 +0300 Subject: [PATCH 2/7] linux_6_16: 6.16 -> 6.16.1 --- 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 90833b9e66cc..8079744aee1d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,7 +32,7 @@ "hash": "sha256:0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9" }, "6.16": { - "version": "6.16", - "hash": "sha256:10ydzfzc3g0nhns6md08gpfshhjcyd58lylqr15alijjdgzf4jqs" + "version": "6.16.1", + "hash": "sha256:1fmcl66wzb4qwz60lgqjan8h9rwnrzw5gndjncaf9qdcqwdljhza" } } From a59d97e50da4455300f0864ad27be4d83354591b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Aug 2025 18:20:41 +0300 Subject: [PATCH 3/7] linux_6_15: 6.15.9 -> 6.15.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 8079744aee1d..3cd5c3d6a421 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb" }, "6.15": { - "version": "6.15.9", - "hash": "sha256:0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9" + "version": "6.15.10", + "hash": "sha256:01pxk3cnil1wbysp4s6ybh5djskxzf9llmk1qy7zfr2l4mwnbkd4" }, "6.16": { "version": "6.16.1", From 6a27b78eea7c031bed3bb2cc2469723a2e342dd0 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Aug 2025 18:20:44 +0300 Subject: [PATCH 4/7] linux_6_12: 6.12.41 -> 6.12.42 --- 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 3cd5c3d6a421..c5308bade89f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc" }, "6.12": { - "version": "6.12.41", - "hash": "sha256:09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb" + "version": "6.12.42", + "hash": "sha256:1yy17c06sn6l0skz8n1kxqhzldgwxxd0xhs11fd3086d56554128" }, "6.15": { "version": "6.15.10", From 040315b3ae8059e5ebe072fb952962034a8f11a4 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Aug 2025 18:20:46 +0300 Subject: [PATCH 5/7] linux_6_6: 6.6.101 -> 6.6.102 --- 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 c5308bade89f..827a57bdabb6 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx" }, "6.6": { - "version": "6.6.101", - "hash": "sha256:1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc" + "version": "6.6.102", + "hash": "sha256:0p6yjifwyrqlppn40isgxb0b5vqmljggmnp7w75vlc2c6fvzxll0" }, "6.12": { "version": "6.12.42", From 83486f52882830ef94258a1824c27f3a600b979b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Aug 2025 18:20:49 +0300 Subject: [PATCH 6/7] linux_6_1: 6.1.147 -> 6.1.148 --- 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 827a57bdabb6..16b9b4fd8254 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0dilsyjyx06b5f9wln6i58xi6nja2g5pj9p2kclfqqhbrgzxkyfl" }, "6.1": { - "version": "6.1.147", - "hash": "sha256:1xv6whvxjcdmvv0cil7nnac4hs2hxjnc98agx08xiqs179k2b3r1" + "version": "6.1.148", + "hash": "sha256:18c024bqqc3srzv2gva55p95yghjc6x3p3f54v3hziki4wx3v86r" }, "5.15": { "version": "5.15.189", From 4a833ab56de4680b004330023fb04f61913b0e7b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Aug 2025 18:25:49 +0300 Subject: [PATCH 7/7] linux/common-config: update for 6.17 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 6593b0d5e294..814ea7edb81c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -329,7 +329,7 @@ let BONDING = module; NET_L3_MASTER_DEV = option yes; NET_FOU_IP_TUNNELS = option yes; - IP_NF_TARGET_REDIRECT = module; + IP_NF_TARGET_REDIRECT = whenOlder "6.17" module; NETKIT = whenAtLeast "6.7" yes; PPP_MULTILINK = yes; # PPP multilink support