linux-6.10: Update to 6.10.14

Rebase patches with conflicts

PKGBUILD/linux-6.10/0001-drm-panel-orientation-quirks.patch

@@ -1,6 +1,6 @@
-diff -rupN linux-6.10.10.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c linux-6.10.10/drivers/gpu/drm/drm_panel_orientation_quirks.c
---- linux-6.10.10.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c	2024-09-12 09:13:13.000000000 +0000
-+++ linux-6.10.10/drivers/gpu/drm/drm_panel_orientation_quirks.c	2024-09-16 20:47:08.254324853 +0000
+diff -rupN linux-6.10.14.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c linux-6.10.14/drivers/gpu/drm/drm_panel_orientation_quirks.c
+--- linux-6.10.14.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c	2024-10-10 10:01:14.000000000 +0000
++++ linux-6.10.14/drivers/gpu/drm/drm_panel_orientation_quirks.c	2024-10-11 10:43:38.431857304 +0000
 @@ -147,6 +147,12 @@ static const struct drm_dmi_panel_orient
  	.orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,
  };
@@ -66,26 +66,20 @@ diff -rupN linux-6.10.10.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c lin
  	}, {	/* AYA NEO NEXT */
  		.matches = {
  		  DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
-@@ -208,6 +238,18 @@ static const struct dmi_system_id orient
+@@ -208,6 +238,12 @@ static const struct dmi_system_id orient
  		  DMI_MATCH(DMI_BOARD_NAME, "KUN"),
  		},
  		.driver_data = (void *)&lcd1600x2560_rightside_up,
-+        }, {    /* AYA NEO SLIDE */
-+                .matches = {
-+                  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "AYANEO"),
-+                  DMI_MATCH(DMI_PRODUCT_NAME, "SLIDE"),
-+        },
-+                .driver_data = (void *)&lcd1080x1920_leftside_up,
-+	}, {    /* AYN Loki Zero, Max, Max Pro */
++	}, {    /* AYA NEO SLIDE */
 +		.matches = {
-+		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ayn"),
-+		  DMI_MATCH(DMI_PRODUCT_NAME, "Loki"),
-+	},
++		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "AYANEO"),
++		  DMI_MATCH(DMI_PRODUCT_NAME, "SLIDE"),
++		},
 +		.driver_data = (void *)&lcd1080x1920_leftside_up,
- 	}, {	/* Chuwi HiBook (CWI514) */
+ 	}, {    /* AYN Loki Max */
  		.matches = {
- 			DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"),
-@@ -285,6 +327,12 @@ static const struct dmi_system_id orient
+ 			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ayn"),
+@@ -297,6 +333,12 @@ static const struct dmi_system_id orient
  		  DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"),
  		},
  		.driver_data = (void *)&gpd_win2,

PKGBUILD/linux-6.10/0060-asus-patch-series.patch

@@ -1,139 +1,3 @@
-From 392ed067a203f26a61a42ee286748f14e1870803 Mon Sep 17 00:00:00 2001
-From: "Luke D. Jones" <luke@ljones.dev>
-Date: Sat, 31 Aug 2024 12:36:18 +1200
-Subject: [PATCH 01/21] platform/x86/amd: pmf: Make ASUS GA403 quirk generic
-
-The original quirk should match to GA403U so that the full
-range of GA403U models can benefit.
-
-Signed-off-by: Luke D. Jones <luke@ljones.dev>
----
- drivers/platform/x86/amd/pmf/pmf-quirks.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/platform/x86/amd/pmf/pmf-quirks.c b/drivers/platform/x86/amd/pmf/pmf-quirks.c
-index 460444cda1b2..48870ca52b41 100644
---- a/drivers/platform/x86/amd/pmf/pmf-quirks.c
-+++ b/drivers/platform/x86/amd/pmf/pmf-quirks.c
-@@ -25,7 +25,7 @@ static const struct dmi_system_id fwbug_list[] = {
- 		.ident = "ROG Zephyrus G14",
- 		.matches = {
- 			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
--			DMI_MATCH(DMI_PRODUCT_NAME, "GA403UV"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "GA403U"),
- 		},
- 		.driver_data = &quirk_no_sps_bug,
- 	},
--- 
-2.46.0
-
-
-From 26fcf70258b2038144244f404849eff1d5b88b5f Mon Sep 17 00:00:00 2001
-From: "Luke D. Jones" <luke@ljones.dev>
-Date: Thu, 25 Jul 2024 10:31:25 +1200
-Subject: [PATCH 02/21] hid-asus: add ROG Ally X prod ID to quirk list
-
-The new ASUS ROG Ally X functions almost exactly the same as the previous
-model, so we can use the same quirks.
-
-Signed-off-by: Luke D. Jones <luke@ljones.dev>
-Signed-off-by: Jiri Kosina <jkosina@suse.com>
----
- drivers/hid/hid-asus.c | 3 +++
- drivers/hid/hid-ids.h  | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
-index 37e6d25593c2..a282388b7aa5 100644
---- a/drivers/hid/hid-asus.c
-+++ b/drivers/hid/hid-asus.c
-@@ -1248,6 +1248,9 @@ static const struct hid_device_id asus_devices[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
- 	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY),
- 	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
-+	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X),
-+	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
- 	    USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),
- 	  QUIRK_ROG_CLAYMORE_II_KEYBOARD },
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 72d56ee7ce1b..6e3223389080 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -210,6 +210,7 @@
- #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3	0x1a30
- #define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR		0x18c6
- #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY		0x1abe
-+#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X		0x1b4c
- #define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD	0x196b
- #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD	0x1869
-
--- 
-2.46.0
-
-
-From a33ceec06332d0cf59c6da61eca3512a8895cf34 Mon Sep 17 00:00:00 2001
-From: "Luke D. Jones" <luke@ljones.dev>
-Date: Tue, 6 Aug 2024 11:46:03 +1200
-Subject: [PATCH 03/21] platform/x86: asus-wmi: Add quirk for ROG Ally X
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The new ROG Ally X functions the same as the previus model so we can use
-the same method to ensure the MCU USB devices wake and reconnect
-correctly.
-
-Given that two devices marks the start of a trend, this patch also adds
-a quirk table to make future additions easier if the MCU is the same.
-
-Signed-off-by: Luke D. Jones <luke@ljones.dev>
-Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
-Link: https://lore.kernel.org/r/20240805234603.38736-1-luke@ljones.dev
-Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
----
- drivers/platform/x86/asus-wmi.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index bc9c5db38324..5fe5149549cc 100644
---- a/drivers/platform/x86/asus-wmi.c
-+++ b/drivers/platform/x86/asus-wmi.c
-@@ -146,6 +146,20 @@ static const char * const ashs_ids[] = { "ATK4001", "ATK4002", NULL };
-
- static int throttle_thermal_policy_write(struct asus_wmi *);
-
-+static const struct dmi_system_id asus_ally_mcu_quirk[] = {
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_BOARD_NAME, "RC71L"),
-+		},
-+	},
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_BOARD_NAME, "RC72L"),
-+		},
-+	},
-+	{ },
-+};
-+
- static bool ashs_present(void)
- {
- 	int i = 0;
-@@ -4650,7 +4664,7 @@ static int asus_wmi_add(struct platform_device *pdev)
- 	asus->dgpu_disable_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_DGPU);
- 	asus->kbd_rgb_state_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_STATE);
- 	asus->ally_mcu_usb_switch = acpi_has_method(NULL, ASUS_USB0_PWR_EC0_CSEE)
--						&& dmi_match(DMI_BOARD_NAME, "RC71L");
-+						&& dmi_check_system(asus_ally_mcu_quirk);
-
- 	if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MINI_LED_MODE))
- 		asus->mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE;
--- 
-2.46.0
-
-
 From e0287028d7a0d39a8535ddaf0b10907e16bd9380 Mon Sep 17 00:00:00 2001
 From: Jonathan LoBue <jlobue10@gmail.com>
 Date: Sat, 13 Jul 2024 00:12:06 -0700

PKGBUILD/linux-6.10/PKGBUILD

@@ -6,8 +6,8 @@
 #             Mikael Eriksson <mikael_eriksson@miffe.org>
 
 pkgbase=linux
-pkgver=6.10.10
-pkgrel=5
+pkgver=6.10.14
+pkgrel=1
 pkgdesc="Linux Stable"
 arch=(x86_64)
 url="https://kernel.org/"
@@ -64,9 +64,10 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
   'A2FF3A36AAA56654109064AB19802F8B0D70FC30'  # Jan Alexander Steffens (heftig)
 )
-sha256sums=('SKIP'
+sha256sums=(
+'55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e' # linux-6.10.14.tar.xz
 '9a5419e5236028eb47121b165fd5b510356f9757107d3f4f6cf7b1383620cc7d' # config
-'510515d461e6a7b02c276b9d8e7e97131173d7cc5ba6c51f911493afd9670c6e' # 0001-drm-panel-orientation-quirks.patch
+'f49d04544842728761e9405dfb95c98cb33e9f42c56f846e242309d19f154114' # 0001-drm-panel-orientation-quirks.patch
 '71d093c5c95d7bd594dd8dcd804eabe2f6b95398c519ded42b7d8994f384e4d8' # 0002-drm-amdgpu-always-allocate-cleared-VRAM-for-GEM-allo.patch
 '38db1ffbacc2315df6ec862404e0dfe73360f950c75336a960b9da382b2a8e7d' # 0003-Set-amdgpu.ppfeaturemask-0xffffffff-as-default.patch
 '783da391e0f45635eefb583b8b3acc29cd62a0c9eeefedf7f790dc2f89c7e279' # 0006-Ayaneo-geek-headset-patch.patch
@@ -85,7 +86,7 @@ sha256sums=('SKIP'
 '2728588169bb1e1b4d9987c0732a316e39670f0c873429179b894ddc6be9b0fa' # 0040-amdgpu-quirks.patch
 'c6ff653b1e55c5524b237a40683a34240d4ec7b95e524441ed3ae09ed885f674' # 0050-AMD-Pstate-Core-Performance-Boost.patch
 '7c7df8d4427c807e2cea0f1e147efcdfb1e7c1c5271823cc6bb49f10b1846d19' # 0051-drm-amd-display-let-update_planes_and_stream_state-d.patch
-'f0768a4a6e5dd59e872567aca684cd2df86a4fa34899ba73b9c0944348d995e8' # 0060-asus-patch-series.patch
+'24a159254ae60fc0ea6e64fcb98649bbd3b8f34f84ff306621fe3edde2cbbaf1' # 0060-asus-patch-series.patch
 '23673c33ea69f3508ff9265d27171e2e58899950d563a1726a6049afe9e92067' # 0099-add-ayaneo-and-ayn-platform-drivers.patch
 )