From a187f23b4fd57f49b97827b2a3ed7eb751c2c960 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 24 Mar 2025 18:31:54 +0300
Subject: [PATCH] linux_6_14: init at 6.14

Also:
- enable cgroup_dmem on 6.14+
- enable devicetree explicitly (because whatever was pulling it in before doesn't now)
---
 pkgs/os-specific/linux/kernel/common-config.nix |  5 +++++
 pkgs/os-specific/linux/kernel/kernels-org.json  |  4 ++++
 pkgs/top-level/aliases.nix                      |  2 ++
 pkgs/top-level/linux-kernels.nix                | 11 ++++++++++-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index b66a2f6abaaa..5d290b3158b1 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -868,6 +868,7 @@ let
       CGROUP_HUGETLB = yes;
       CGROUP_PERF = yes;
       CGROUP_RDMA = yes;
+      CGROUP_DMEM = whenAtLeast "6.14" yes;
 
       MEMCG = yes;
       MEMCG_SWAP = whenOlder "6.1" yes;
@@ -1095,6 +1096,10 @@ let
 
         MD = yes; # Device mapper (RAID, LVM, etc.)
 
+        # enable support for device trees and overlays
+        OF = option yes;
+        OF_OVERLAY = option yes;
+
         # Enable initrd support.
         BLK_DEV_INITRD = yes;
 
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 3cd2bfdc4f51..d73a2578522a 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,5 +30,9 @@
     "6.13": {
         "version": "6.13.8",
         "hash": "sha256:1fqsfnam0ca2lyqgi9vh7x6xa24yjk6ym6z85bn6nrrxsxczm6i5"
+    },
+    "6.14": {
+        "version": "6.14",
+        "hash": "sha256:0w3nqh02vl8f2wsx3fmsvw1pdsnjs5zfqcmv2w2vnqdiwy1vd552"
     }
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 57a73f5c1860..e4062f94646f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -853,6 +853,7 @@ mapAliases {
   linuxPackages_6_11 = linuxKernel.packages.linux_6_11;
   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_rpi0 = linuxKernel.packages.linux_rpi1;
   linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
   linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -879,6 +880,7 @@ mapAliases {
   linux_6_11 = linuxKernel.kernels.linux_6_11;
   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_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 fa080a7bb21a..551ee973895e 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -213,6 +213,14 @@ in {
       ];
     };
 
+    linux_6_14 = callPackage ../os-specific/linux/kernel/mainline.nix {
+      branch = "6.14";
+      kernelPatches = [
+        kernelPatches.bridge_stp_helper
+        kernelPatches.request_key_helper
+      ];
+    };
+
     linux_testing = let
       testing = callPackage ../os-specific/linux/kernel/mainline.nix {
         # A special branch that tracks the kernel under the release process
@@ -672,6 +680,7 @@ in {
     linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
     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);
   } // lib.optionalAttrs config.allowAliases {
     linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11
     linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
@@ -742,7 +751,7 @@ in {
   packageAliases = {
     linux_default = packages.linux_6_12;
     # Update this when adding the newest kernel major version!
-    linux_latest = packages.linux_6_13;
+    linux_latest = packages.linux_6_14;
     linux_rt_default = packages.linux_rt_5_15;
     linux_rt_latest = packages.linux_rt_6_6;
   } // lib.optionalAttrs config.allowAliases {