From a498c2132129b4d9f35b7a167da4462a8189afc0 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:13 +0300 Subject: [PATCH 1/7] linux_testing: 6.12-rc3 -> 6.12-rc4 --- 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 e4f61b03c104..f1f8afa35e8b 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-rc3", - "hash": "sha256:11jspf9h3zmqnnyjardyk1g9k09fivwbl267iddb2ildfhgrlvqw" + "version": "6.12-rc4", + "hash": "sha256:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk" }, "6.1": { "version": "6.1.113", From 3dffc1ef91996cfd308f87d78888a99e60428b2d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:21 +0300 Subject: [PATCH 2/7] linux_6_11: 6.11.4 -> 6.11.5 --- 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 f1f8afa35e8b..f8e9bfdc3c43 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,7 +28,7 @@ "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram" }, "6.11": { - "version": "6.11.4", - "hash": "sha256:0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x" + "version": "6.11.5", + "hash": "sha256:01rafnqal2v96dzkabz0irymq4sc9ja00ggyv1xn7yzjnyrqa527" } } From c0b43de177e6cc1ac03f6b6bab64b8f4aecce996 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:29 +0300 Subject: [PATCH 3/7] linux_6_6: 6.6.57 -> 6.6.58 --- 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 f8e9bfdc3c43..436fe1e725a0 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.57", - "hash": "sha256:1cxpmgbp8hhwa045gappf2wzh3kk1iw2xivsxzhvi6bgz5p45kk6" + "version": "6.6.58", + "hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7" }, "6.10": { "version": "6.10.14", From 8b91f4ab38ab483b2c50624664b7a363e8b47e79 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:39 +0300 Subject: [PATCH 4/7] linux_6_1: 6.1.113 -> 6.1.114 --- 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 436fe1e725a0..4823c474229d 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:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk" }, "6.1": { - "version": "6.1.113", - "hash": "sha256:0c4y8j65b3im0bf4ji4n7nfqaqa7c7ym2515li855k1g363i1bsl" + "version": "6.1.114", + "hash": "sha256:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2" }, "5.15": { "version": "5.15.168", From b86393146e0d751f86dc1b93c4d42d7070295290 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:47 +0300 Subject: [PATCH 5/7] linux_5_15: 5.15.168 -> 5.15.169 --- 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 4823c474229d..937fe3d46aaa 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:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2" }, "5.15": { - "version": "5.15.168", - "hash": "sha256:0yp1705rjadv2v7hw2yq9n3bxgqzmlyam2bnp49p10jnfkavpgng" + "version": "5.15.169", + "hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676" }, "5.10": { "version": "5.10.227", From 57e480426a5a8ac14d9e8784f99c40b8e38baf05 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 17:48:56 +0300 Subject: [PATCH 6/7] linux_5_10: 5.10.227 -> 5.10.228 --- 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 937fe3d46aaa..764244480419 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676" }, "5.10": { - "version": "5.10.227", - "hash": "sha256:1hknbfxq59731zmxgig7b69lfdmgh5jdg391hapvmlrh07hrvq2j" + "version": "5.10.228", + "hash": "sha256:0wkvn49sdy9ykyz6cqdqd9yplqfhc6b255w6wc17ky182mzqvk3n" }, "5.4": { "version": "5.4.284", From 7f3092416aeb3a50c7a5301dce051ea3198716c5 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 22 Oct 2024 18:03:11 +0300 Subject: [PATCH 7/7] linux: cherry-pick netfilter fix --- pkgs/os-specific/linux/kernel/patches.nix | 10 ++++++++++ pkgs/top-level/linux-kernels.nix | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9e15991dd635..17598d74e5f6 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,4 +60,14 @@ 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://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/patch/?id=306ed1728e8438caed30332e1ab46b28c25fe3d8"; + hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4="; + }; + }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8099591d0c6a..3418a7925ca4 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -138,6 +138,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -146,6 +147,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -154,6 +156,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -162,6 +165,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -170,6 +174,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -178,6 +183,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.netfilter-typo-fix ]; }; @@ -194,6 +200,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; @@ -205,6 +212,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.netfilter-typo-fix ]; }; latest = packageAliases.linux_latest.kernel;