From df9bb8a436607da124e8cfa0fd19e70e9d9e0b7b Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Sun, 12 Nov 2023 11:23:50 +0100
Subject: [PATCH] surface: linux 6.5.7 -> 6.5.11

---
 microsoft/surface/common/default.nix                      | 2 +-
 microsoft/surface/common/kernel/default.nix               | 2 +-
 .../kernel/{linux-6.5.7 => linux-6.5.x}/default.nix       | 8 ++++----
 .../kernel/{linux-6.5.7 => linux-6.5.x}/patches.nix       | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename microsoft/surface/common/kernel/{linux-6.5.7 => linux-6.5.x}/default.nix (80%)
 rename microsoft/surface/common/kernel/{linux-6.5.7 => linux-6.5.x}/patches.nix (100%)

diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix
index 2aec8db..b6b00ee 100644
--- a/microsoft/surface/common/default.nix
+++ b/microsoft/surface/common/default.nix
@@ -10,7 +10,7 @@ in {
     ./surface-control
   ];
 
-  microsoft-surface.kernelVersion = mkDefault "6.5.7";
+  microsoft-surface.kernelVersion = mkDefault "6.5.11";
 
   # Seems to be required to properly enable S0ix "Modern Standby":
   boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];
diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix
index a209460..a0637a3 100644
--- a/microsoft/surface/common/kernel/default.nix
+++ b/microsoft/surface/common/kernel/default.nix
@@ -5,8 +5,8 @@ let
 
 in {
   imports = [
-    ./linux-6.5.7
     ./linux-6.1.x
+    ./linux-6.5.x
   ];
 
   options.microsoft-surface.kernelVersion = mkOption {
diff --git a/microsoft/surface/common/kernel/linux-6.5.7/default.nix b/microsoft/surface/common/kernel/linux-6.5.x/default.nix
similarity index 80%
rename from microsoft/surface/common/kernel/linux-6.5.7/default.nix
rename to microsoft/surface/common/kernel/linux-6.5.x/default.nix
index fe6825b..b26b466 100644
--- a/microsoft/surface/common/kernel/linux-6.5.7/default.nix
+++ b/microsoft/surface/common/kernel/linux-6.5.x/default.nix
@@ -8,7 +8,7 @@ let
 
   cfg = config.microsoft-surface;
 
-  version = "6.5.7";
+  version = "6.5.11";
   extraMeta.branch = "6.5";
   patchDir = repos.linux-surface + "/patches/${extraMeta.branch}";
   kernelPatches = pkgs.callPackage ./patches.nix {
@@ -20,17 +20,17 @@ let
     inherit version extraMeta kernelPatches;
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-      sha256 = "135v3y2vgc83dca4xi7q52wqi4dkfal74k1y73jwzj85h12fl28d";
+      sha256 = "sha256-LuJK+SgrgJI7LaVrcKrX3y6O5OPwdkUuBbpmviBZtRk=";
     };
   };
 
 
 in {
   options.microsoft-surface.kernelVersion = mkOption {
-    type = types.enum [ "6.5.7" ];
+    type = types.enum [ version ];
   };
 
-  config = mkIf (cfg.kernelVersion == "6.5.7") {
+  config = mkIf (cfg.kernelVersion == version) {
     boot = {
       inherit kernelPackages;
     };
diff --git a/microsoft/surface/common/kernel/linux-6.5.7/patches.nix b/microsoft/surface/common/kernel/linux-6.5.x/patches.nix
similarity index 100%
rename from microsoft/surface/common/kernel/linux-6.5.7/patches.nix
rename to microsoft/surface/common/kernel/linux-6.5.x/patches.nix