Skip to content

Commit 936d7e5

Browse files
antheasantheas
committed
bump to 6.17.7-ba08
1 parent d2abee4 commit 936d7e5

File tree

2 files changed

+176
-8
lines changed

2 files changed

+176
-8
lines changed

‎kernel.spec‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ Summary: The Linux kernel
176176
%define specrpmversion 6.17.7
177177
%define specversion 6.17.7
178178
%define patchversion 6.17
179-
%define pkgrelease ba07
179+
%define pkgrelease ba08
180180
%define kversion 6
181181
%define tarfile_release 6.17.7
182182
# This is needed to do merge window version magic
183183
%define patchlevel 17
184184
# This allows pkg_release to have configurable %%{?dist} tag
185-
%define specrelease ba07%{?buildid}%{?dist}
185+
%define specrelease ba08%{?buildid}%{?dist}
186186
# This defines the kabi tarball version
187187
%define kabiversion 6.17.7
188188

@@ -2540,7 +2540,8 @@ BuildKernel() {
25402540
# with the same name, therefore, we cannot use the filtermods logic. Remove the
25412541
# nvidia drivers from modules.dep so we can create a package list manually
25422542
cat $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.dep | \
2543-
grep -v "kernel/drivers/custom/nvidia/" \
2543+
grep -v "kernel/drivers/custom/nvidia/" | \
2544+
grep -v "kernel/drivers/custom/nvidia-lts/" \
25442545
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.dep.tmp
25452546
mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.dep.tmp \
25462547
$RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.dep
@@ -4536,7 +4537,9 @@ fi\
45364537
#
45374538
#
45384539
%changelog
4539-
* Tue Nov 11 2025 Antheas Kapenekakis <[email protected]> [6.17.7-ba07]
4540+
* Wed Nov 12 2025 Antheas Kapenekakis <[email protected]> [6.17.7-ba08]
4541+
- Revert "Input: xpad - use new BTN_GRIP* buttons" (Antheas Kapenekakis)
4542+
- Revert "Input: xpad - change buttons the D-Pad gets mapped as to BTN_DPAD_*" (Antheas Kapenekakis)
45404543
- platform/x86: msi-wmi-platform: Fix typo in WMI GUID (Armin Wolf)
45414544
- platform/x86: msi-wmi-platform: Only load on MSI devices (Armin Wolf)
45424545
- ALSA: hda/realtek: Add ASUS GA403W quirk (Antheas Kapenekakis)

‎patch-2-handheld.patch‎

Lines changed: 169 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51019,7 +51019,7 @@ Signed-off-by: Antheas Kapenekakis <[email protected]>
5101951019
drivers/Kconfig | 2 +
5102051020
drivers/Makefile | 2 +
5102151021
drivers/custom/.gitignore | 3 +
51022-
drivers/custom/Kconfig | 121 +++++++++++
51022+
drivers/custom/Kconfig | 122 +++++++++++
5102351023
drivers/custom/Makefile | 46 ++++
5102451024
drivers/custom/ayaneo_platform | 1 +
5102551025
drivers/custom/ayn_platform | 1 +
@@ -51050,7 +51050,7 @@ Signed-off-by: Antheas Kapenekakis <[email protected]>
5105051050
tools/objtool/builtin-check.c | 1 +
5105151051
tools/objtool/check.c | 3 +
5105251052
tools/objtool/include/objtool/builtin.h | 1 +
51053-
35 files changed, 540 insertions(+), 2 deletions(-)
51053+
35 files changed, 541 insertions(+), 2 deletions(-)
5105451054
create mode 100644 .gitmodules
5105551055
create mode 100644 drivers/custom/.gitignore
5105651056
create mode 100644 drivers/custom/Kconfig
@@ -51188,10 +51188,10 @@ index 000000000000..b9adbda1674e
5118851188
\ No newline at end of file
5118951189
diff --git a/drivers/custom/Kconfig b/drivers/custom/Kconfig
5119051190
new file mode 100644
51191-
index 000000000000..778f6188e9a5
51191+
index 000000000000..fef5c07dcb64
5119251192
--- /dev/null
5119351193
+++ b/drivers/custom/Kconfig
51194-
@@ -0,0 +1,121 @@
51194+
@@ -0,0 +1,122 @@
5119551195
+config AYN
5119651196
+ tristate "AYN Platform Driver"
5119751197
+ help
@@ -51260,6 +51260,7 @@ index 000000000000..778f6188e9a5
5126051260
+
5126151261
+config WL
5126251262
+ tristate "Broadcom WL Driver"
51263+
+ depends on CFG80211
5126351264
+ help
5126451265
+ Broadcom WL driver for Linux. Link:
5126551266
+ https://github.com/bazzite-org/broadcom-wl
@@ -52477,3 +52478,167 @@ index 59a03b00791a..2dbaa3c1f55c 100644
5247752478
--
5247852479
2.51.2
5247952480

52481+
52482+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
52483+
From: Antheas Kapenekakis <[email protected]>
52484+
Date: Wed, 12 Nov 2025 23:20:48 +0100
52485+
Subject: Revert "Input: xpad - change buttons the D-Pad gets mapped as to
52486+
BTN_DPAD_*"
52487+
52488+
This reverts commit a43a503df996739ae34f179f6b73b0ae91000c5c.
52489+
---
52490+
drivers/input/joystick/xpad.c | 28 ++++++++++++++--------------
52491+
1 file changed, 14 insertions(+), 14 deletions(-)
52492+
52493+
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
52494+
index d2483ce93099..0b918611b2a7 100644
52495+
--- a/drivers/input/joystick/xpad.c
52496+
+++ b/drivers/input/joystick/xpad.c
52497+
@@ -444,8 +444,8 @@ static const signed short xpad_btn[] = {
52498+
52499+
/* used when dpad is mapped to buttons */
52500+
static const signed short xpad_btn_pad[] = {
52501+
- BTN_DPAD_LEFT, BTN_DPAD_RIGHT, /* d-pad left, right */
52502+
- BTN_DPAD_UP, BTN_DPAD_DOWN, /* d-pad up, down */
52503+
+ BTN_TRIGGER_HAPPY1, BTN_TRIGGER_HAPPY2, /* d-pad left, right */
52504+
+ BTN_TRIGGER_HAPPY3, BTN_TRIGGER_HAPPY4, /* d-pad up, down */
52505+
-1 /* terminating entry */
52506+
};
52507+
52508+
@@ -843,10 +843,10 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d
52509+
/* digital pad */
52510+
if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
52511+
/* dpad as buttons (left, right, up, down) */
52512+
- input_report_key(dev, BTN_DPAD_LEFT, data[2] & BIT(2));
52513+
- input_report_key(dev, BTN_DPAD_RIGHT, data[2] & BIT(3));
52514+
- input_report_key(dev, BTN_DPAD_UP, data[2] & BIT(0));
52515+
- input_report_key(dev, BTN_DPAD_DOWN, data[2] & BIT(1));
52516+
+ input_report_key(dev, BTN_TRIGGER_HAPPY1, data[2] & BIT(2));
52517+
+ input_report_key(dev, BTN_TRIGGER_HAPPY2, data[2] & BIT(3));
52518+
+ input_report_key(dev, BTN_TRIGGER_HAPPY3, data[2] & BIT(0));
52519+
+ input_report_key(dev, BTN_TRIGGER_HAPPY4, data[2] & BIT(1));
52520+
} else {
52521+
input_report_abs(dev, ABS_HAT0X,
52522+
!!(data[2] & 0x08) - !!(data[2] & 0x04));
52523+
@@ -894,10 +894,10 @@ static void xpad360_process_packet(struct usb_xpad *xpad, struct input_dev *dev,
52524+
/* digital pad */
52525+
if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
52526+
/* dpad as buttons (left, right, up, down) */
52527+
- input_report_key(dev, BTN_DPAD_LEFT, data[2] & BIT(2));
52528+
- input_report_key(dev, BTN_DPAD_RIGHT, data[2] & BIT(3));
52529+
- input_report_key(dev, BTN_DPAD_UP, data[2] & BIT(0));
52530+
- input_report_key(dev, BTN_DPAD_DOWN, data[2] & BIT(1));
52531+
+ input_report_key(dev, BTN_TRIGGER_HAPPY1, data[2] & BIT(2));
52532+
+ input_report_key(dev, BTN_TRIGGER_HAPPY2, data[2] & BIT(3));
52533+
+ input_report_key(dev, BTN_TRIGGER_HAPPY3, data[2] & BIT(0));
52534+
+ input_report_key(dev, BTN_TRIGGER_HAPPY4, data[2] & BIT(1));
52535+
}
52536+
52537+
/*
52538+
@@ -1116,10 +1116,10 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
52539+
/* digital pad */
52540+
if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
52541+
/* dpad as buttons (left, right, up, down) */
52542+
- input_report_key(dev, BTN_DPAD_LEFT, data[5] & BIT(2));
52543+
- input_report_key(dev, BTN_DPAD_RIGHT, data[5] & BIT(3));
52544+
- input_report_key(dev, BTN_DPAD_UP, data[5] & BIT(0));
52545+
- input_report_key(dev, BTN_DPAD_DOWN, data[5] & BIT(1));
52546+
+ input_report_key(dev, BTN_TRIGGER_HAPPY1, data[5] & BIT(2));
52547+
+ input_report_key(dev, BTN_TRIGGER_HAPPY2, data[5] & BIT(3));
52548+
+ input_report_key(dev, BTN_TRIGGER_HAPPY3, data[5] & BIT(0));
52549+
+ input_report_key(dev, BTN_TRIGGER_HAPPY4, data[5] & BIT(1));
52550+
} else {
52551+
input_report_abs(dev, ABS_HAT0X,
52552+
!!(data[5] & 0x08) - !!(data[5] & 0x04));
52553+
--
52554+
2.51.2
52555+
52556+
52557+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
52558+
From: Antheas Kapenekakis <[email protected]>
52559+
Date: Wed, 12 Nov 2025 23:20:52 +0100
52560+
Subject: Revert "Input: xpad - use new BTN_GRIP* buttons"
52561+
52562+
This reverts commit e7412ba919f625438c570d8b4fbf16c5f31b583d.
52563+
---
52564+
drivers/input/joystick/xpad.c | 36 +++++++++++++++++------------------
52565+
1 file changed, 18 insertions(+), 18 deletions(-)
52566+
52567+
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
52568+
index 0b918611b2a7..5ec7684f93ed 100644
52569+
--- a/drivers/input/joystick/xpad.c
52570+
+++ b/drivers/input/joystick/xpad.c
52571+
@@ -481,8 +481,8 @@ static const signed short xpad_abs_triggers[] = {
52572+
52573+
/* used when the controller has extra paddle buttons */
52574+
static const signed short xpad_btn_paddles[] = {
52575+
- BTN_GRIPR, BTN_GRIPR2, /* paddle upper right, lower right */
52576+
- BTN_GRIPL, BTN_GRIPL2, /* paddle upper left, lower left */
52577+
+ BTN_TRIGGER_HAPPY5, BTN_TRIGGER_HAPPY6, /* paddle upper right, lower right */
52578+
+ BTN_TRIGGER_HAPPY7, BTN_TRIGGER_HAPPY8, /* paddle upper left, lower left */
52579+
-1 /* terminating entry */
52580+
};
52581+
52582+
@@ -1078,10 +1078,10 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
52583+
data[18] = 0;
52584+
52585+
/* Elite Series 2 split packet paddle bits */
52586+
- input_report_key(dev, BTN_GRIPR, data[18] & BIT(0));
52587+
- input_report_key(dev, BTN_GRIPR2, data[18] & BIT(1));
52588+
- input_report_key(dev, BTN_GRIPL, data[18] & BIT(2));
52589+
- input_report_key(dev, BTN_GRIPL2, data[18] & BIT(3));
52590+
+ input_report_key(dev, BTN_TRIGGER_HAPPY5, data[18] & BIT(0));
52591+
+ input_report_key(dev, BTN_TRIGGER_HAPPY6, data[18] & BIT(1));
52592+
+ input_report_key(dev, BTN_TRIGGER_HAPPY7, data[18] & BIT(2));
52593+
+ input_report_key(dev, BTN_TRIGGER_HAPPY8, data[18] & BIT(3));
52594+
52595+
do_sync = true;
52596+
}
52597+
@@ -1178,10 +1178,10 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
52598+
data[32] = 0;
52599+
52600+
/* OG Elite Series Controller paddle bits */
52601+
- input_report_key(dev, BTN_GRIPR, data[32] & BIT(1));
52602+
- input_report_key(dev, BTN_GRIPR2, data[32] & BIT(3));
52603+
- input_report_key(dev, BTN_GRIPL, data[32] & BIT(0));
52604+
- input_report_key(dev, BTN_GRIPL2, data[32] & BIT(2));
52605+
+ input_report_key(dev, BTN_TRIGGER_HAPPY5, data[32] & BIT(1));
52606+
+ input_report_key(dev, BTN_TRIGGER_HAPPY6, data[32] & BIT(3));
52607+
+ input_report_key(dev, BTN_TRIGGER_HAPPY7, data[32] & BIT(0));
52608+
+ input_report_key(dev, BTN_TRIGGER_HAPPY8, data[32] & BIT(2));
52609+
} else if (xpad->packet_type == PKT_XBE2_FW_OLD) {
52610+
/* Mute paddles if controller has a custom mapping applied.
52611+
* Checked by comparing the current mapping
52612+
@@ -1191,10 +1191,10 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
52613+
data[18] = 0;
52614+
52615+
/* Elite Series 2 4.x firmware paddle bits */
52616+
- input_report_key(dev, BTN_GRIPR, data[18] & BIT(0));
52617+
- input_report_key(dev, BTN_GRIPR2, data[18] & BIT(1));
52618+
- input_report_key(dev, BTN_GRIPL, data[18] & BIT(2));
52619+
- input_report_key(dev, BTN_GRIPL2, data[18] & BIT(3));
52620+
+ input_report_key(dev, BTN_TRIGGER_HAPPY5, data[18] & BIT(0));
52621+
+ input_report_key(dev, BTN_TRIGGER_HAPPY6, data[18] & BIT(1));
52622+
+ input_report_key(dev, BTN_TRIGGER_HAPPY7, data[18] & BIT(2));
52623+
+ input_report_key(dev, BTN_TRIGGER_HAPPY8, data[18] & BIT(3));
52624+
} else if (xpad->packet_type == PKT_XBE2_FW_5_EARLY) {
52625+
/* Mute paddles if controller has a custom mapping applied.
52626+
* Checked by comparing the current mapping
52627+
@@ -1206,10 +1206,10 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
52628+
/* Elite Series 2 5.x firmware paddle bits
52629+
* (before the packet was split)
52630+
*/
52631+
- input_report_key(dev, BTN_GRIPR, data[22] & BIT(0));
52632+
- input_report_key(dev, BTN_GRIPR2, data[22] & BIT(1));
52633+
- input_report_key(dev, BTN_GRIPL, data[22] & BIT(2));
52634+
- input_report_key(dev, BTN_GRIPL2, data[22] & BIT(3));
52635+
+ input_report_key(dev, BTN_TRIGGER_HAPPY5, data[22] & BIT(0));
52636+
+ input_report_key(dev, BTN_TRIGGER_HAPPY6, data[22] & BIT(1));
52637+
+ input_report_key(dev, BTN_TRIGGER_HAPPY7, data[22] & BIT(2));
52638+
+ input_report_key(dev, BTN_TRIGGER_HAPPY8, data[22] & BIT(3));
52639+
}
52640+
}
52641+
52642+
--
52643+
2.51.2
52644+

0 commit comments

Comments
 (0)