From: Greg Kroah-Hartman Date: Sun, 28 Apr 2024 13:09:02 +0000 (+0200) Subject: drop 2 patches that caused build warnings X-Git-Tag: v6.1.89~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=083677a867d9b37fba354046b4263b2f602b9471;p=thirdparty%2Fkernel%2Fstable-queue.git drop 2 patches that caused build warnings --- diff --git a/queue-5.10/hid-logitech-dj-allow-mice-to-use-all-types-of-repor.patch b/queue-5.10/hid-logitech-dj-allow-mice-to-use-all-types-of-repor.patch deleted file mode 100644 index 4e633a9e1d3..00000000000 --- a/queue-5.10/hid-logitech-dj-allow-mice-to-use-all-types-of-repor.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5fbfa712836ece589d2c631a906fcc4a323e2c79 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 3 Apr 2024 19:54:24 +0300 -Subject: HID: logitech-dj: allow mice to use all types of reports - -From: Yaraslau Furman - -[ Upstream commit 21f28a7eb78dea6c59be6b0a5e0b47bf3d25fcbb ] - -You can bind whatever action you want to the mouse's reprogrammable -buttons using Windows application. Allow Linux to receive multimedia keycodes. - -Fixes: 3ed224e273ac ("HID: logitech-dj: Fix 064d:c52f receiver support") -Signed-off-by: Yaraslau Furman -Reviewed-by: Hans de Goede -Signed-off-by: Jiri Kosina -Signed-off-by: Sasha Levin ---- - drivers/hid/hid-logitech-dj.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c -index f4d79ec826797..929a2c7cbc05e 100644 ---- a/drivers/hid/hid-logitech-dj.c -+++ b/drivers/hid/hid-logitech-dj.c -@@ -904,9 +904,7 @@ static void logi_hidpp_dev_conn_notif_equad(struct hid_device *hdev, - } - break; - case REPORT_TYPE_MOUSE: -- workitem->reports_supported |= STD_MOUSE | HIDPP; -- if (djrcv_dev->type == recvr_type_mouse_only) -- workitem->reports_supported |= MULTIMEDIA; -+ workitem->reports_supported |= STD_MOUSE | HIDPP | MULTIMEDIA; - break; - } - } --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 03240707a61..4bd0844d68a 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -69,7 +69,6 @@ init-main.c-fix-potential-static_command_line-memory-overflow.patch drm-amdgpu-validate-the-parameters-of-bo-mapping-operations-more-clearly.patch nouveau-fix-instmem-race-condition-around-ptr-stores.patch nilfs2-fix-oob-in-nilfs_set_de_type.patch -hid-logitech-dj-allow-mice-to-use-all-types-of-repor.patch arm64-dts-rockchip-fix-alphabetical-ordering-rk3399-.patch arm64-dts-rockchip-enable-internal-pull-up-on-pcie_w.patch arm64-dts-rockchip-remove-unsupported-node-from-the-.patch diff --git a/queue-5.4/hid-logitech-dj-allow-mice-to-use-all-types-of-repor.patch b/queue-5.4/hid-logitech-dj-allow-mice-to-use-all-types-of-repor.patch deleted file mode 100644 index d87557dda1e..00000000000 --- a/queue-5.4/hid-logitech-dj-allow-mice-to-use-all-types-of-repor.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9630702e71f75f88bb1b1afb81926035721850ff Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 3 Apr 2024 19:54:24 +0300 -Subject: HID: logitech-dj: allow mice to use all types of reports - -From: Yaraslau Furman - -[ Upstream commit 21f28a7eb78dea6c59be6b0a5e0b47bf3d25fcbb ] - -You can bind whatever action you want to the mouse's reprogrammable -buttons using Windows application. Allow Linux to receive multimedia keycodes. - -Fixes: 3ed224e273ac ("HID: logitech-dj: Fix 064d:c52f receiver support") -Signed-off-by: Yaraslau Furman -Reviewed-by: Hans de Goede -Signed-off-by: Jiri Kosina -Signed-off-by: Sasha Levin ---- - drivers/hid/hid-logitech-dj.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c -index 0c2aa9024b878..32236f39664b7 100644 ---- a/drivers/hid/hid-logitech-dj.c -+++ b/drivers/hid/hid-logitech-dj.c -@@ -904,9 +904,7 @@ static void logi_hidpp_dev_conn_notif_equad(struct hid_device *hdev, - } - break; - case REPORT_TYPE_MOUSE: -- workitem->reports_supported |= STD_MOUSE | HIDPP; -- if (djrcv_dev->type == recvr_type_mouse_only) -- workitem->reports_supported |= MULTIMEDIA; -+ workitem->reports_supported |= STD_MOUSE | HIDPP | MULTIMEDIA; - break; - } - } --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index b8555cfef2f..35eafdf619b 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -49,7 +49,6 @@ fs-sysfs-fix-reference-leak-in-sysfs_break_active_protection.patch nouveau-fix-instmem-race-condition-around-ptr-stores.patch nilfs2-fix-oob-in-nilfs_set_de_type.patch kvm-async_pf-cleanup-kvm_setup_async_pf.patch -hid-logitech-dj-allow-mice-to-use-all-types-of-repor.patch arm64-dts-rockchip-fix-alphabetical-ordering-rk3399-.patch arm64-dts-rockchip-enable-internal-pull-up-on-pcie_w.patch arm64-dts-mediatek-mt8183-add-power-domains-properit.patch