From ee12486fde78756359ec4e8168943d93fe1288d1 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 1 Nov 2024 08:09:39 +0300 Subject: [PATCH 1/6] linux_testing: 6.12-rc4 -> 6.12-rc5 --- 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 98391c4d0433..5a8f6467b6b5 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.12-rc4", - "hash": "sha256:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk" + "version": "6.12-rc5", + "hash": "sha256:18zh3nwhsz1hpyhmlim9a2hz8yvx5psrrav4346k46x9ybfardqy" }, "6.1": { "version": "6.1.114", From a3ac03e5ce9410898a477b2c084d087d9c51f916 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 1 Nov 2024 08:09:42 +0300 Subject: [PATCH 2/6] linux_6_11: 6.11.5 -> 6.11.6 --- 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 5a8f6467b6b5..73d5d28da5d6 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,7 +24,7 @@ "hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7" }, "6.11": { - "version": "6.11.5", - "hash": "sha256:01rafnqal2v96dzkabz0irymq4sc9ja00ggyv1xn7yzjnyrqa527" + "version": "6.11.6", + "hash": "sha256:1kiky6viwrgm47slpv234lfq1wrwj29p5rx168gix3q0jw0zcm69" } } From 05b2afe1c8e9b43d05ca9f4b6bf6dba1222bc99a Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 1 Nov 2024 08:09:45 +0300 Subject: [PATCH 3/6] linux_6_6: 6.6.58 -> 6.6.59 --- 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 73d5d28da5d6..fc45ea5898cf 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:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "6.6": { - "version": "6.6.58", - "hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7" + "version": "6.6.59", + "hash": "sha256:0vd76ccd4li4wsg04gc4nai9f4y1nknz967qby0i53y0v046hq93" }, "6.11": { "version": "6.11.6", From ca59d24d8e0aec090207d342b37b99851128081f Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 1 Nov 2024 08:09:48 +0300 Subject: [PATCH 4/6] linux_6_1: 6.1.114 -> 6.1.115 --- 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 fc45ea5898cf..136214fca3f4 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:18zh3nwhsz1hpyhmlim9a2hz8yvx5psrrav4346k46x9ybfardqy" }, "6.1": { - "version": "6.1.114", - "hash": "sha256:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2" + "version": "6.1.115", + "hash": "sha256:0vxs6zj4p0ihcp11h3svqy3wa1yph0f1vzc8dlvqh60zgs1bmn0g" }, "5.15": { "version": "5.15.169", From 8fac93634b789bd42868486cfcf4e34dfeaf9d27 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 1 Nov 2024 08:09:53 +0300 Subject: [PATCH 5/6] linux_5_15: 5.15.169 -> 5.15.170 --- 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 136214fca3f4..bd57aee756b0 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:0vxs6zj4p0ihcp11h3svqy3wa1yph0f1vzc8dlvqh60zgs1bmn0g" }, "5.15": { - "version": "5.15.169", - "hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676" + "version": "5.15.170", + "hash": "sha256:1ag7fvixhdcyxv6rqfsvq2wh02g64r4rx8izvfb33nfnld2nangx" }, "5.10": { "version": "5.10.228", From c845b354600d64970f2a728d35079852ef18ff43 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 1 Nov 2024 08:10:32 +0300 Subject: [PATCH 6/6] linux: remove patch backport --- pkgs/os-specific/linux/kernel/patches.nix | 10 ---------- pkgs/top-level/linux-kernels.nix | 10 +--------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 551fb58ed4ee..9e15991dd635 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,14 +60,4 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; - - # Backport upstream fix for very annoying Tailscale issue - # FIXME: remove when merged upstream - netfilter-typo-fix = { - name = "netfilter-typo-fix"; - patch = fetchpatch { - url = "https://lore.kernel.org/netdev/20241021094536.81487-3-pablo@netfilter.org/raw"; - hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4="; - }; - }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8d6d9b4d0d05..9f7ed1e1ca1b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -54,7 +54,7 @@ let broken = kernel.meta.broken; }; }; - kernelPatches = lib.filter ({ name ? null, ... }: name != "netfilter-typo-fix") kernel.kernelPatches ++ [ + kernelPatches = kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} ]; isHardened = true; @@ -138,7 +138,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.netfilter-typo-fix ]; }; @@ -147,7 +146,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate - kernelPatches.netfilter-typo-fix ]; }; @@ -156,7 +154,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.netfilter-typo-fix ]; }; @@ -165,7 +162,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate - kernelPatches.netfilter-typo-fix ]; }; @@ -174,7 +170,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.netfilter-typo-fix ]; }; @@ -183,7 +178,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate - kernelPatches.netfilter-typo-fix ]; }; @@ -192,7 +186,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.netfilter-typo-fix ]; }; @@ -204,7 +197,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.netfilter-typo-fix ]; }; latest = packageAliases.linux_latest.kernel;