From 9d16aed4efa324e73f6455fba511998e375c2bb6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 28 Dec 2020 13:44:56 +0100 Subject: [PATCH] dropped duplicate hid patch --- ...ro-k147-to-descriptor-override.patch-15254 | 43 ------------------- queue-4.14/series | 1 - ...ero-k147-to-descriptor-override.patch-2583 | 43 ------------------- queue-4.19/series | 1 - ...ro-k147-to-descriptor-override.patch-25904 | 43 ------------------- queue-5.4/series | 1 - 6 files changed, 132 deletions(-) delete mode 100644 queue-4.14/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-15254 delete mode 100644 queue-4.19/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-2583 delete mode 100644 queue-5.4/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-25904 diff --git a/queue-4.14/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-15254 b/queue-4.14/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-15254 deleted file mode 100644 index 389f76c05e8..00000000000 --- a/queue-4.14/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-15254 +++ /dev/null @@ -1,43 +0,0 @@ -From 5f27f8375839bd1c7fb189e68a6679da9f6d8a03 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.14/series b/queue-4.14/series index 0a12b2b80e2..4ab5fcc5687 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -62,7 +62,6 @@ media-msi2500-assign-spi-bus-number-dynamically.patch crypto-af_alg-avoid-undefined-behavior-accessing-salg_name.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-15254 drm-gma500-fix-double-free-of-gma_connector.patch soc-renesas-rmobile-sysc-fix-some-leaks-in-rmobile_i.patch soc-mediatek-check-if-power-domains-can-be-powered-o.patch diff --git a/queue-4.19/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-2583 b/queue-4.19/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-2583 deleted file mode 100644 index 64286fd13d5..00000000000 --- a/queue-4.19/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-2583 +++ /dev/null @@ -1,43 +0,0 @@ -From 1135ff48f8fda9eccc639784159c3a395638ef52 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.19/series b/queue-4.19/series index 2691e54ac9d..0d68cbac9b6 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -95,7 +95,6 @@ crypto-af_alg-avoid-undefined-behavior-accessing-salg_name.patch md-fix-a-warning-caused-by-a-race-between-concurrent-md_ioctl-s.patch perf-cs-etm-change-tuple-from-traceid-cpu-to-traceid-metadata.patch perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch -hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-2583 drm-gma500-fix-double-free-of-gma_connector.patch drm-tve200-fix-handling-of-platform_get_irq-error.patch soc-renesas-rmobile-sysc-fix-some-leaks-in-rmobile_i.patch diff --git a/queue-5.4/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-25904 b/queue-5.4/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-25904 deleted file mode 100644 index 5a3503f7447..00000000000 --- a/queue-5.4/hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-25904 +++ /dev/null @@ -1,43 +0,0 @@ -From 3c0de4b6c68f57899a26846f9fdb5d5264790c42 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 8e0f67455c098..d5b2efcea87fd 100644 ---- a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c -+++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c -@@ -413,6 +413,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-5.4/series b/queue-5.4/series index 693ab290573..c384b5fee1e 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -70,7 +70,6 @@ quota-sanity-check-quota-file-headers-on-load.patch media-msi2500-assign-spi-bus-number-dynamically.patch crypto-af_alg-avoid-undefined-behavior-accessing-salg_name.patch md-fix-a-warning-caused-by-a-race-between-concurrent-md_ioctl-s.patch -hid-i2c-hid-add-vero-k147-to-descriptor-override.patch-25904 drm-gma500-fix-double-free-of-gma_connector.patch drm-aspeed-fix-kconfig-warning-subsequent-build-erro.patch drm-mcde-fix-handling-of-platform_get_irq-error.patch -- 2.47.3