Merge branch 'master' into master

bashfulrobot · web-flow · commit 1008f7f0d11f · 2025-08-19T10:08:42.000-07:00
diff --git a/microsoft/surface/common/kernel/6.12/patches.nix b/microsoft/surface/common/kernel/6.12/patches.nix
@@ -9,7 +9,7 @@
   {
     name = "microsoft-surface-patches-linux-${version}";
     patch = null;
-    extraStructuredConfig = with kernel; {
+    structuredExtraConfig = with kernel; {
       STAGING_MEDIA = yes;
 
       ##
diff --git a/microsoft/surface/common/kernel/6.15/patches.nix b/microsoft/surface/common/kernel/6.15/patches.nix
@@ -9,7 +9,7 @@
   {
     name = "microsoft-surface-patches-linux-${version}";
     patch = null;
-    extraStructuredConfig = with kernel; {
+    structuredExtraConfig = with kernel; {
       STAGING_MEDIA = yes;
       ##
       ## Surface Aggregator Module

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`{`
`10`	`10`	`name = "microsoft-surface-patches-linux-${version}";`
`11`	`11`	`patch = null;`
`12`		`- extraStructuredConfig = with kernel; {`
	`12`	`+ structuredExtraConfig = with kernel; {`
`13`	`13`	`STAGING_MEDIA = yes;`
`14`	`14`
`15`	`15`	`##`