From 470f6946014b1b5be776e67bb7f486efa6dca48b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 26 May 2025 10:47:26 +0300
Subject: [PATCH] linux_6_15: init at 6.15

(cherry picked from commit a4eed1fa7941b174a6111c61ef3d41bbdfbbfd53)
---
 pkgs/os-specific/linux/kernel/kernels-org.json |  4 ++++
 pkgs/top-level/aliases.nix                     |  2 ++
 pkgs/top-level/linux-kernels.nix               | 11 ++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 2856e4df6a2f..d6253cf4726b 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -34,5 +34,9 @@
     "6.14": {
         "version": "6.14.8",
         "hash": "sha256:0199maj3mk577wwaszbi0cl5a0afx1ynad896bmmg8vm636jxcb2"
+    },
+    "6.15": {
+        "version": "6.15",
+        "hash": "sha256:0r4ppfd5kwvj24bjig92hxa18lmjgy9gqvh5qknfffw08wjrd1km"
     }
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cf3d51cb4d67..8e3b3ccb3d75 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -671,6 +671,7 @@ mapAliases {
   linuxPackages_6_12 = linuxKernel.packages.linux_6_12;
   linuxPackages_6_13 = linuxKernel.packages.linux_6_13;
   linuxPackages_6_14 = linuxKernel.packages.linux_6_14;
+  linuxPackages_6_15 = linuxKernel.packages.linux_6_15;
   linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
   linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
   linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -693,6 +694,7 @@ mapAliases {
   linux_6_12 = linuxKernel.kernels.linux_6_12;
   linux_6_13 = linuxKernel.kernels.linux_6_13;
   linux_6_14 = linuxKernel.kernels.linux_6_14;
+  linux_6_15 = linuxKernel.kernels.linux_6_15;
   linux_rpi0 = linuxKernel.kernels.linux_rpi1;
   linux_rpi02w = linuxKernel.kernels.linux_rpi3;
   linux_rpi1 = linuxKernel.kernels.linux_rpi1;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 3170b17ab5ef..730df12d4f78 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -227,6 +227,14 @@ in
           ];
         };
 
+        linux_6_15 = callPackage ../os-specific/linux/kernel/mainline.nix {
+          branch = "6.15";
+          kernelPatches = [
+            kernelPatches.bridge_stp_helper
+            kernelPatches.request_key_helper
+          ];
+        };
+
         linux_testing =
           let
             testing = callPackage ../os-specific/linux/kernel/mainline.nix {
@@ -718,6 +726,7 @@ in
       linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
       linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);
       linux_6_14 = recurseIntoAttrs (packagesFor kernels.linux_6_14);
+      linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15);
     }
     // 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
@@ -783,7 +792,7 @@ in
   packageAliases = {
     linux_default = packages.linux_6_6;
     # Update this when adding the newest kernel major version!
-    linux_latest = packages.linux_6_14;
+    linux_latest = packages.linux_6_15;
     linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
     linux_rt_default = packages.linux_rt_5_15;
     linux_rt_latest = packages.linux_rt_6_6;