Skip to content

Commit 08887f7

Browse files
committed
surface: linux 6.12.19 -> 6.13.8
1 parent 380ed15 commit 08887f7

File tree

4 files changed

+27
-23
lines changed

4 files changed

+27
-23
lines changed

microsoft/surface/common/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ in {
88
./kernel
99
];
1010

11-
microsoft-surface.kernelVersion = mkDefault "6.12";
11+
microsoft-surface.kernelVersion = mkDefault "6.13";
1212

1313
# Seems to be required to properly enable S0ix "Modern Standby":
1414
boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];

microsoft/surface/common/kernel/linux-surface/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ let
77

88
cfg = config.microsoft-surface;
99

10-
version = "6.12.19";
10+
version = "6.13.8";
1111
kernelPatches = surfacePatches {
1212
inherit version;
1313
patchFn = ./patches.nix;
1414
};
1515
kernelPackages = linuxPackage {
1616
inherit version kernelPatches;
17-
sha256 = "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE=";
17+
sha256 = "sha256-JZr6Wdc9Z2vsKuib6s2UngjVTT9wp/iwp0IxUJV1Grs=";
1818
ignoreConfigErrors=true;
1919
};
2020

microsoft/surface/common/kernel/linux-surface/patches.nix

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ CONFIG_SURFACE_BOOK1_DGPU_SWITCH= module;
9999
patch = patchSrc + "/0001-secureboot.patch";
100100
}
101101
{
102-
name = "ms-surface/0002-surface3-oemb";
103-
patch = patchSrc + "/0002-surface3-oemb.patch";
102+
name = "ms-surface/0002-surface3";
103+
patch = patchSrc + "/0002-surface3.patch";
104104
}
105105
{
106106
name = "ms-surface/0003-mwifiex";
@@ -119,35 +119,39 @@ CONFIG_SURFACE_BOOK1_DGPU_SWITCH= module;
119119
patch = patchSrc + "/0006-ithc.patch";
120120
}
121121
{
122-
name = "ms-surface/0007-surface-sam-over-hid";
123-
patch = patchSrc + "/0007-surface-sam-over-hid.patch";
122+
name = "ms-surface/0007-surface-sam";
123+
patch = patchSrc + "/0007-surface-sam.patch";
124124
}
125125
{
126-
name = "ms-surface/0008-surface-button";
127-
patch = patchSrc + "/0008-surface-button.patch";
126+
name = "ms-surface/0008-surface-sam-over-hid";
127+
patch = patchSrc + "/0008-surface-sam-over-hid.patch";
128128
}
129129
{
130-
name = "ms-surface/0009-surface-typecover";
131-
patch = patchSrc + "/0009-surface-typecover.patch";
130+
name = "ms-surface/0009-surface-button";
131+
patch = patchSrc + "/0009-surface-button.patch";
132132
}
133133
{
134-
name = "ms-surface/0010-surface-shutdown";
135-
patch = patchSrc + "/0010-surface-shutdown.patch";
134+
name = "ms-surface/0010-surface-typecover";
135+
patch = patchSrc + "/0010-surface-typecover.patch";
136136
}
137137
{
138-
name = "ms-surface/0011-surface-gpe";
139-
patch = patchSrc + "/0011-surface-gpe.patch";
138+
name = "ms-surface/0011-surface-shutdown";
139+
patch = patchSrc + "/0011-surface-shutdown.patch";
140140
}
141141
{
142-
name = "ms-surface/0012-cameras";
143-
patch = patchSrc + "/0012-cameras.patch";
142+
name = "ms-surface/0012-surface-gpe";
143+
patch = patchSrc + "/0012-surface-gpe.patch";
144144
}
145145
{
146-
name = "ms-surface/0013-amd-gpio";
147-
patch = patchSrc + "/0013-amd-gpio.patch";
146+
name = "ms-surface/0013-cameras";
147+
patch = patchSrc + "/0013-cameras.patch";
148148
}
149149
{
150-
name = "ms-surface/0014-rtc";
151-
patch = patchSrc + "/0014-rtc.patch";
150+
name = "ms-surface/0014-amd-gpio";
151+
patch = patchSrc + "/0014-amd-gpio.patch";
152+
}
153+
{
154+
name = "ms-surface/0015-rtc";
155+
patch = patchSrc + "/0015-rtc.patch";
152156
}
153157
]

microsoft/surface/common/repos.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
linux-surface = fetchFromGitHub {
55
owner = "linux-surface";
66
repo = "linux-surface";
7-
rev = "arch-6.12.7-1";
8-
hash = "sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY=";
7+
rev = "arch-6.13.6-1";
8+
hash = "sha256-otD1ckNxNnvV8xipf9SZpbfg+bBq5EPwyieYtLIV4Ck=";
99
};
1010

1111
# This is the owner and repo for the pre-patched kernel from the "linux-surface" project:

0 commit comments

Comments
 (0)