From: Greg Kroah-Hartman Date: Tue, 4 Feb 2020 10:04:36 +0000 (+0000) Subject: drop input-aiptek-use-descriptors-of-current-altsetting.patch from everywhere X-Git-Tag: v5.5.2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b42a17a4c24a99184117bf59712f3c71df20e366;p=thirdparty%2Fkernel%2Fstable-queue.git drop input-aiptek-use-descriptors-of-current-altsetting.patch from everywhere --- diff --git a/queue-4.14/input-aiptek-use-descriptors-of-current-altsetting.patch b/queue-4.14/input-aiptek-use-descriptors-of-current-altsetting.patch deleted file mode 100644 index 2f8514aa237..00000000000 --- a/queue-4.14/input-aiptek-use-descriptors-of-current-altsetting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6d3a6800d4be737d22daa7c25e48deee21895a99 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 10 Jan 2020 11:59:52 -0800 -Subject: Input: aiptek - use descriptors of current altsetting - -From: Johan Hovold - -[ Upstream commit cfa4f6a99fb183742cace65ec551b444852b8ef6 ] - -Make sure to always use the descriptors of the current alternate setting -to avoid future issues when accessing fields that may differ between -settings. - -Signed-off-by: Johan Hovold -Acked-by: Vladis Dronov -Link: https://lore.kernel.org/r/20191210113737.4016-4-johan@kernel.org -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/tablet/aiptek.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c -index fbe2df91aad3a..838b91337cd03 100644 ---- a/drivers/input/tablet/aiptek.c -+++ b/drivers/input/tablet/aiptek.c -@@ -1733,7 +1733,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) - - aiptek->inputdev = inputdev; - aiptek->intf = intf; -- aiptek->ifnum = intf->altsetting[0].desc.bInterfaceNumber; -+ aiptek->ifnum = intf->cur_altsetting->desc.bInterfaceNumber; - aiptek->inDelay = 0; - aiptek->endDelay = 0; - aiptek->previousJitterable = 0; --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 4c63a3a5c65..9f5823b3abf 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -67,7 +67,6 @@ wireless-wext-avoid-gcc-o3-warning.patch net-dsa-bcm_sf2-configure-imp-port-for-2gb-sec.patch bnxt_en-fix-ipv6-rfs-filter-matching-logic.patch iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch -input-aiptek-use-descriptors-of-current-altsetting.patch arm-dts-am335x-boneblack-common-fix-memory-size.patch vti-6-fix-packet-tx-through-bpf_redirect.patch scsi-fnic-do-not-queue-commands-during-fwreset.patch diff --git a/queue-4.19/input-aiptek-use-descriptors-of-current-altsetting.patch b/queue-4.19/input-aiptek-use-descriptors-of-current-altsetting.patch deleted file mode 100644 index 11bab82ad5d..00000000000 --- a/queue-4.19/input-aiptek-use-descriptors-of-current-altsetting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7dc04dcbf775acf47747bc17d2e9993d4350b16d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 10 Jan 2020 11:59:52 -0800 -Subject: Input: aiptek - use descriptors of current altsetting - -From: Johan Hovold - -[ Upstream commit cfa4f6a99fb183742cace65ec551b444852b8ef6 ] - -Make sure to always use the descriptors of the current alternate setting -to avoid future issues when accessing fields that may differ between -settings. - -Signed-off-by: Johan Hovold -Acked-by: Vladis Dronov -Link: https://lore.kernel.org/r/20191210113737.4016-4-johan@kernel.org -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/tablet/aiptek.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c -index dc2ad1cc8fe1d..8632ca509887d 100644 ---- a/drivers/input/tablet/aiptek.c -+++ b/drivers/input/tablet/aiptek.c -@@ -1726,7 +1726,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) - - aiptek->inputdev = inputdev; - aiptek->intf = intf; -- aiptek->ifnum = intf->altsetting[0].desc.bInterfaceNumber; -+ aiptek->ifnum = intf->cur_altsetting->desc.bInterfaceNumber; - aiptek->inDelay = 0; - aiptek->endDelay = 0; - aiptek->previousJitterable = 0; --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 5fda9db771b..09e2106a466 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -49,7 +49,6 @@ bnxt_en-fix-ipv6-rfs-filter-matching-logic.patch riscv-delete-temporary-files.patch iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch iwlwifi-don-t-ignore-the-cap-field-upon-mcc-update.patch -input-aiptek-use-descriptors-of-current-altsetting.patch arm-dts-am335x-boneblack-common-fix-memory-size.patch vti-6-fix-packet-tx-through-bpf_redirect.patch xfrm-interface-fix-packet-tx-through-bpf_redirect.patch diff --git a/queue-4.4/input-aiptek-use-descriptors-of-current-altsetting.patch b/queue-4.4/input-aiptek-use-descriptors-of-current-altsetting.patch deleted file mode 100644 index 350cc155a0b..00000000000 --- a/queue-4.4/input-aiptek-use-descriptors-of-current-altsetting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From dae56fbae0a4890e171d65de99deec7e9090bb5c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 10 Jan 2020 11:59:52 -0800 -Subject: Input: aiptek - use descriptors of current altsetting - -From: Johan Hovold - -[ Upstream commit cfa4f6a99fb183742cace65ec551b444852b8ef6 ] - -Make sure to always use the descriptors of the current alternate setting -to avoid future issues when accessing fields that may differ between -settings. - -Signed-off-by: Johan Hovold -Acked-by: Vladis Dronov -Link: https://lore.kernel.org/r/20191210113737.4016-4-johan@kernel.org -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/tablet/aiptek.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c -index 40a166773c1b4..142f34a0a3cb6 100644 ---- a/drivers/input/tablet/aiptek.c -+++ b/drivers/input/tablet/aiptek.c -@@ -1731,7 +1731,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) - aiptek->inputdev = inputdev; - aiptek->usbdev = usbdev; - aiptek->intf = intf; -- aiptek->ifnum = intf->altsetting[0].desc.bInterfaceNumber; -+ aiptek->ifnum = intf->cur_altsetting->desc.bInterfaceNumber; - aiptek->inDelay = 0; - aiptek->endDelay = 0; - aiptek->previousJitterable = 0; --- -2.20.1 - diff --git a/queue-4.4/net-fix-skb-csum-update-in-inet_proto_csum_replace16.patch b/queue-4.4/net-fix-skb-csum-update-in-inet_proto_csum_replace16.patch index 9eda0819763..7e4192bbe62 100644 --- a/queue-4.4/net-fix-skb-csum-update-in-inet_proto_csum_replace16.patch +++ b/queue-4.4/net-fix-skb-csum-update-in-inet_proto_csum_replace16.patch @@ -27,14 +27,12 @@ Reviewed-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- - net/core/utils.c | 20 +++++++++++++++++--- + net/core/utils.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -diff --git a/net/core/utils.c b/net/core/utils.c -index 3d17ca8b47441..13eb3552de078 100644 --- a/net/core/utils.c +++ b/net/core/utils.c -@@ -316,6 +316,23 @@ void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, +@@ -316,6 +316,23 @@ void inet_proto_csum_replace4(__sum16 *s } EXPORT_SYMBOL(inet_proto_csum_replace4); @@ -58,7 +56,7 @@ index 3d17ca8b47441..13eb3552de078 100644 void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb, const __be32 *from, const __be32 *to, bool pseudohdr) -@@ -327,9 +344,6 @@ void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb, +@@ -327,9 +344,6 @@ void inet_proto_csum_replace16(__sum16 * if (skb->ip_summed != CHECKSUM_PARTIAL) { *sum = csum_fold(csum_partial(diff, sizeof(diff), ~csum_unfold(*sum))); @@ -68,6 +66,3 @@ index 3d17ca8b47441..13eb3552de078 100644 } else if (pseudohdr) *sum = ~csum_fold(csum_partial(diff, sizeof(diff), csum_unfold(*sum))); --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 064909b091a..0148cbd9120 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -35,7 +35,6 @@ clk-mmp2-fix-the-order-of-timer-mux-parents.patch ixgbevf-remove-limit-of-10-entries-for-unicast-filte.patch ixgbe-fix-calculation-of-queue-with-vfs-and-flow-dir.patch wireless-wext-avoid-gcc-o3-warning.patch -input-aiptek-use-descriptors-of-current-altsetting.patch vti-6-fix-packet-tx-through-bpf_redirect.patch scsi-fnic-do-not-queue-commands-during-fwreset.patch arm-8955-1-virt-relax-arch-timer-version-check-durin.patch diff --git a/queue-4.9/input-aiptek-use-descriptors-of-current-altsetting.patch b/queue-4.9/input-aiptek-use-descriptors-of-current-altsetting.patch deleted file mode 100644 index 2a3da874d3a..00000000000 --- a/queue-4.9/input-aiptek-use-descriptors-of-current-altsetting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 98f0ffd7c040bb20f3605dbef75ecc687a17aab2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 10 Jan 2020 11:59:52 -0800 -Subject: Input: aiptek - use descriptors of current altsetting - -From: Johan Hovold - -[ Upstream commit cfa4f6a99fb183742cace65ec551b444852b8ef6 ] - -Make sure to always use the descriptors of the current alternate setting -to avoid future issues when accessing fields that may differ between -settings. - -Signed-off-by: Johan Hovold -Acked-by: Vladis Dronov -Link: https://lore.kernel.org/r/20191210113737.4016-4-johan@kernel.org -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/tablet/aiptek.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c -index 5a7e5e073e526..3b5bccad4a1bb 100644 ---- a/drivers/input/tablet/aiptek.c -+++ b/drivers/input/tablet/aiptek.c -@@ -1733,7 +1733,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) - - aiptek->inputdev = inputdev; - aiptek->intf = intf; -- aiptek->ifnum = intf->altsetting[0].desc.bInterfaceNumber; -+ aiptek->ifnum = intf->cur_altsetting->desc.bInterfaceNumber; - aiptek->inDelay = 0; - aiptek->endDelay = 0; - aiptek->previousJitterable = 0; --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 2cb5445d9ff..8a64ea04cc1 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -48,7 +48,6 @@ ixgbe-fix-calculation-of-queue-with-vfs-and-flow-dir.patch wireless-fix-enabling-channel-12-for-custom-regulato.patch mac80211-fix-tkip-replay-protection-immediately-afte.patch wireless-wext-avoid-gcc-o3-warning.patch -input-aiptek-use-descriptors-of-current-altsetting.patch vti-6-fix-packet-tx-through-bpf_redirect.patch scsi-fnic-do-not-queue-commands-during-fwreset.patch arm-8955-1-virt-relax-arch-timer-version-check-durin.patch diff --git a/queue-5.4/input-aiptek-use-descriptors-of-current-altsetting.patch b/queue-5.4/input-aiptek-use-descriptors-of-current-altsetting.patch deleted file mode 100644 index 947f430f624..00000000000 --- a/queue-5.4/input-aiptek-use-descriptors-of-current-altsetting.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5c4f071eb8536f23776a658057371741e561a166 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 10 Jan 2020 11:59:52 -0800 -Subject: Input: aiptek - use descriptors of current altsetting - -From: Johan Hovold - -[ Upstream commit cfa4f6a99fb183742cace65ec551b444852b8ef6 ] - -Make sure to always use the descriptors of the current alternate setting -to avoid future issues when accessing fields that may differ between -settings. - -Signed-off-by: Johan Hovold -Acked-by: Vladis Dronov -Link: https://lore.kernel.org/r/20191210113737.4016-4-johan@kernel.org -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/tablet/aiptek.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c -index 06d0ffef4a171..e08b0ef078e81 100644 ---- a/drivers/input/tablet/aiptek.c -+++ b/drivers/input/tablet/aiptek.c -@@ -1713,7 +1713,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) - - aiptek->inputdev = inputdev; - aiptek->intf = intf; -- aiptek->ifnum = intf->altsetting[0].desc.bInterfaceNumber; -+ aiptek->ifnum = intf->cur_altsetting->desc.bInterfaceNumber; - aiptek->inDelay = 0; - aiptek->endDelay = 0; - aiptek->previousJitterable = 0; --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index c10a1ffcfc8..8c962d5196e 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -62,7 +62,6 @@ iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch iwlwifi-don-t-ignore-the-cap-field-upon-mcc-update.patch iwlwifi-dbg-force-stop-the-debug-monitor-hw.patch input-evdev-convert-kzalloc-vzalloc-to-kvzalloc.patch -input-aiptek-use-descriptors-of-current-altsetting.patch arm-dts-am335x-boneblack-common-fix-memory-size.patch vti-6-fix-packet-tx-through-bpf_redirect.patch xfrm-interface-fix-packet-tx-through-bpf_redirect.patch