From 55fc5e69cb1f2d9a6981aff0d18176af45215199 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Sun, 17 Sep 2023 14:19:30 +0200
Subject: [PATCH] surface: linux 6.4.14 -> 6.4.16

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

diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix
index eceba75..69e0d69 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.4.14";
+  microsoft-surface.kernelVersion = mkDefault "6.4.16";
 
   # 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 c625815..5f3a9a5 100644
--- a/microsoft/surface/common/kernel/default.nix
+++ b/microsoft/surface/common/kernel/default.nix
@@ -8,7 +8,7 @@ in {
     ./linux-5.19.17
     ./linux-6.0.17
     ./linux-6.1.18
-    ./linux-6.4.14
+    ./linux-6.4.16
   ];
 
   options.microsoft-surface.kernelVersion = mkOption {
diff --git a/microsoft/surface/common/kernel/linux-6.4.14/default.nix b/microsoft/surface/common/kernel/linux-6.4.16/default.nix
similarity index 80%
rename from microsoft/surface/common/kernel/linux-6.4.14/default.nix
rename to microsoft/surface/common/kernel/linux-6.4.16/default.nix
index ae75c94..abdcf74 100644
--- a/microsoft/surface/common/kernel/linux-6.4.14/default.nix
+++ b/microsoft/surface/common/kernel/linux-6.4.16/default.nix
@@ -8,7 +8,7 @@ let
 
   cfg = config.microsoft-surface;
 
-  version = "6.4.14";
+  version = "6.4.16";
   extraMeta.branch = "6.4";
   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 = "1rjh0jrn5qvxwzmyg478n08vckkld8r52nkc102ppqvsfhiy7skm";
+      sha256 = "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln";
     };
   };
 
 
 in {
   options.microsoft-surface.kernelVersion = mkOption {
-    type = types.enum [ "6.4.14" ];
+    type = types.enum [ "6.4.16" ];
   };
 
-  config = mkIf (cfg.kernelVersion == "6.4.14") {
+  config = mkIf (cfg.kernelVersion == "6.4.16") {
     boot = {
       inherit kernelPackages;
     };
diff --git a/microsoft/surface/common/kernel/linux-6.4.14/patches.nix b/microsoft/surface/common/kernel/linux-6.4.16/patches.nix
similarity index 100%
rename from microsoft/surface/common/kernel/linux-6.4.14/patches.nix
rename to microsoft/surface/common/kernel/linux-6.4.16/patches.nix