From 5ca7d128e6d8e6bd8ac59aa8af0486915d40771e Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Mon, 10 Jun 2024 22:24:42 +0200
Subject: [PATCH] surface: linux 6.8.9 -> 6.9.3

---
 microsoft/surface/common/kernel/default.nix   |  2 +-
 .../{linux-6.8.x => linux-6.9.x}/default.nix  |  4 +-
 .../{linux-6.8.x => linux-6.9.x}/patches.nix  | 60 ++++++++++---------
 3 files changed, 35 insertions(+), 31 deletions(-)
 rename microsoft/surface/common/kernel/{linux-6.8.x => linux-6.9.x}/default.nix (87%)
 rename microsoft/surface/common/kernel/{linux-6.8.x => linux-6.9.x}/patches.nix (61%)

diff --git a/microsoft/surface/common/kernel/default.nix b/microsoft/surface/common/kernel/default.nix
index 0c0159a..a8f598d 100644
--- a/microsoft/surface/common/kernel/default.nix
+++ b/microsoft/surface/common/kernel/default.nix
@@ -5,7 +5,7 @@ let
 
 in {
   imports = [
-    ./linux-6.8.x
+    ./linux-6.9.x
   ];
 
   options.microsoft-surface.kernelVersion = mkOption {
diff --git a/microsoft/surface/common/kernel/linux-6.8.x/default.nix b/microsoft/surface/common/kernel/linux-6.9.x/default.nix
similarity index 87%
rename from microsoft/surface/common/kernel/linux-6.8.x/default.nix
rename to microsoft/surface/common/kernel/linux-6.9.x/default.nix
index e016d77..c0fd5c9 100644
--- a/microsoft/surface/common/kernel/linux-6.8.x/default.nix
+++ b/microsoft/surface/common/kernel/linux-6.9.x/default.nix
@@ -7,14 +7,14 @@ let
 
   cfg = config.microsoft-surface;
 
-  version = "6.8.9";
+  version = "6.9.3";
   kernelPatches = surfacePatches {
     inherit version;
     patchFn = ./patches.nix;
   };
   kernelPackages = linuxPackage {
     inherit version kernelPatches;
-    sha256 = "sha256-+QXxI46nqOhTFLrPKDMC6AlwBgENJfzqcm0N4OpbybY=";
+    sha256 = "1bnzxparybwh320019pr2msaapas41dhjmvg4gy791rn05jc88f3";
     ignoreConfigErrors=true;
   };
 
diff --git a/microsoft/surface/common/kernel/linux-6.8.x/patches.nix b/microsoft/surface/common/kernel/linux-6.9.x/patches.nix
similarity index 61%
rename from microsoft/surface/common/kernel/linux-6.8.x/patches.nix
rename to microsoft/surface/common/kernel/linux-6.9.x/patches.nix
index 353764b..9590b9e 100644
--- a/microsoft/surface/common/kernel/linux-6.8.x/patches.nix
+++ b/microsoft/surface/common/kernel/linux-6.9.x/patches.nix
@@ -86,59 +86,63 @@
     };
   }
   {
-    name = "ms-surface/0001-surface3-oemb";
-    patch = patchSrc + "/0001-surface3-oemb.patch";
+    name = "ms-surface/0001-secureboot";
+    patch = patchSrc + "/0001-secureboot.patch";
   }
   {
-    name = "ms-surface/0002-mwifiex";
-    patch = patchSrc + "/0002-mwifiex.patch";
+    name = "ms-surface/0002-surface3-oemb";
+    patch = patchSrc + "/0002-surface3-oemb.patch";
   }
   {
-    name = "ms-surface/0003-ath10k";
-    patch = patchSrc + "/0003-ath10k.patch";
+    name = "ms-surface/0003-mwifiex";
+    patch = patchSrc + "/0003-mwifiex.patch";
   }
   {
-    name = "ms-surface/0004-ipts";
-    patch = patchSrc + "/0004-ipts.patch";
+    name = "ms-surface/0004-ath10k";
+    patch = patchSrc + "/0004-ath10k.patch";
   }
   {
-    name = "ms-surface/0005-ithc";
-    patch = patchSrc + "/0005-ithc.patch";
+    name = "ms-surface/0005-ipts";
+    patch = patchSrc + "/0005-ipts.patch";
   }
   {
-    name = "ms-surface/0006-surface-sam";
-    patch = patchSrc + "/0006-surface-sam.patch";
+    name = "ms-surface/0006-ithc";
+    patch = patchSrc + "/0006-ithc.patch";
   }
   {
-    name = "ms-surface/0007-surface-sam-over-hid";
-    patch = patchSrc + "/0007-surface-sam-over-hid.patch";
+    name = "ms-surface/0007-surface-sam";
+    patch = patchSrc + "/0007-surface-sam.patch";
   }
   {
-    name = "ms-surface/0008-surface-button";
-    patch = patchSrc + "/0008-surface-button.patch";
+    name = "ms-surface/0008-surface-sam-over-hid";
+    patch = patchSrc + "/0008-surface-sam-over-hid.patch";
   }
   {
-    name = "ms-surface/0009-surface-typecover";
-    patch = patchSrc + "/0009-surface-typecover.patch";
+    name = "ms-surface/0009-surface-button";
+    patch = patchSrc + "/0009-surface-button.patch";
   }
   {
-    name = "ms-surface/0010-surface-shutdown";
-    patch = patchSrc + "/0010-surface-shutdown.patch";
+    name = "ms-surface/0010-surface-typecover";
+    patch = patchSrc + "/0010-surface-typecover.patch";
   }
   {
-    name = "ms-surface/0011-surface-gpe";
-    patch = patchSrc + "/0011-surface-gpe.patch";
+    name = "ms-surface/0011-surface-shutdown";
+    patch = patchSrc + "/0011-surface-shutdown.patch";
   }
   {
-    name = "ms-surface/0012-cameras";
-    patch = patchSrc + "/0012-cameras.patch";
+    name = "ms-surface/0012-surface-gpe";
+    patch = patchSrc + "/0012-surface-gpe.patch";
   }
   {
-    name = "ms-surface/0013-amd-gpio";
-    patch = patchSrc + "/0013-amd-gpio.patch";
+    name = "ms-surface/0013-cameras";
+    patch = patchSrc + "/0013-cameras.patch";
   }
   {
-    name = "ms-surface/0014-rtc";
-    patch = patchSrc + "/0014-rtc.patch";
+    name = "ms-surface/0014-amd-gpio";
+    patch = patchSrc + "/0014-amd-gpio.patch";
+  }
+  {
+    name = "ms-surface/0015-rtc";
+    patch = patchSrc + "/0015-rtc.patch";
   }
 ]