From d9b1d8e217529f574fee69196bc9307a2449aeab Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 28 Dec 2020 13:42:12 +0100 Subject: [PATCH] drop duplicated 4.9 patch --- ...ro-k147-to-descriptor-override.patch-15974 | 43 ------------------- queue-4.9/series | 1 - 2 files changed, 44 deletions(-) delete mode 100644 queue-4.9/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-15974 diff --git a/queue-4.9/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-15974 b/queue-4.9/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-15974 deleted file mode 100644 index 8b6f2a8751e..00000000000 --- a/queue-4.9/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-15974 +++ /dev/null @@ -1,43 +0,0 @@ -From b26876a40b3b172e6d07df5b196b34a7e8fa8600 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 26 Nov 2020 18:51:58 +0100 -Subject: HID: i2c-hid: add Vero K147 to descriptor override - -From: Julian Sax - -commit c870d50ce387d84b6438211a7044c60afbd5d60a upstream. - -This device uses the SIPODEV SP1064 touchpad, which does not -supply descriptors, so it has to be added to the override list. - -Cc: stable@vger.kernel.org -Signed-off-by: Julian Sax -Reviewed-by: Hans de Goede -Signed-off-by: Jiri Kosina -Signed-off-by: Greg Kroah-Hartman ---- - drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c -index 58a753ef27175..5808eed6d6ba6 100644 ---- a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c -+++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c -@@ -405,6 +405,14 @@ static const struct dmi_system_id i2c_hid_dmi_desc_override_table[] = { - }, - .driver_data = (void *)&sipodev_desc - }, -+ { -+ .ident = "Vero K147", -+ .matches = { -+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "VERO"), -+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "K147"), -+ }, -+ .driver_data = (void *)&sipodev_desc -+ }, - { } /* Terminate list */ - }; - --- -2.27.0 - diff --git a/queue-4.9/series b/queue-4.9/series index 7a65e5502e6..129142f1afa 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -47,7 +47,6 @@ serial_core-check-for-port-state-when-tty-is-in-error-state.patch media-msi2500-assign-spi-bus-number-dynamically.patch md-fix-a-warning-caused-by-a-race-between-concurrent-md_ioctl-s.patch bluetooth-fix-slab-out-of-bounds-read-in-hci_le_direct_adv_report_evt.patch -hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-15974 drm-gma500-fix-double-free-of-gma_connector.patch rdma-rxe-compute-psn-windows-correctly.patch arm-p2v-fix-handling-of-lpae-translation-in-be-mode.patch -- 2.47.3