From 25838ef515e095056afabec7241967b18ae674c6 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Mon, 24 Nov 2025 18:59:03 +0000 Subject: [PATCH] Change mainline to rc7, manually fix meson64 patch --- config/sources/mainline-kernel.conf.sh | 2 +- .../general-input-touchscreen-Add-D-WAV-Multitouch.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh index 324380170d..3d88647642 100644 --- a/config/sources/mainline-kernel.conf.sh +++ b/config/sources/mainline-kernel.conf.sh @@ -8,7 +8,7 @@ function mainline_kernel_decide_version__upstream_release_candidate_number() { [[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order if [[ "${KERNEL_MAJOR_MINOR}" == "6.18" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released - declare -g KERNELBRANCH="tag:v6.18-rc6" + declare -g KERNELBRANCH="tag:v6.18-rc7" display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info" fi } diff --git a/patch/kernel/archive/meson64-6.18/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.18/general-input-touchscreen-Add-D-WAV-Multitouch.patch index 1aae2a0311..f7d94fcc1c 100644 --- a/patch/kernel/archive/meson64-6.18/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.18/general-input-touchscreen-Add-D-WAV-Multitouch.patch @@ -16,9 +16,9 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 111111111111..222222222222 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1546,4 +1546,10 @@ - #define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a - #define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155 +@@ -1548,4 +1548,10 @@ + #define USB_VENDOR_ID_JIELI_SDK_DEFAULT 0x4c4a + #define USB_DEVICE_ID_JIELI_SDK_4155 0x4155 +#define USB_DEVICE_ID_DWAV_MULTITOUCH 0x0005 + @@ -32,9 +32,9 @@ index 111111111111..222222222222 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -916,6 +916,8 @@ static const struct hid_device_id hid_ignore_list[] = { + #endif { HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) }, - { HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) }, { }