--- /dev/null
+From addf3382c47c033e579c9c88f18e36c4e75d806a Mon Sep 17 00:00:00 2001
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Tue, 13 Aug 2019 15:38:06 +0200
+Subject: Revert "HID: logitech-hidpp: add USB PID for a few more supported mice"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+
+commit addf3382c47c033e579c9c88f18e36c4e75d806a upstream.
+
+This partially reverts commit 27fc32fd9417968a459d43d9a7c50fd423d53eb9.
+
+It turns out that the G502 has some issues with hid-logitech-hidpp:
+when plugging it in, the driver tries to contact it but it fails.
+So the driver bails out leaving only the mouse event node available.
+
+This timeout is problematic as it introduce a delay in the boot,
+and having only the mouse event node means that the hardware
+macros keys can not be relayed to the userspace.
+
+Filipe and I just gave a shot at the following devices:
+
+G403 Wireless (0xC082)
+G703 (0xC087)
+G703 Hero (0xC090)
+G903 (0xC086)
+G903 Hero (0xC091)
+G Pro (0xC088)
+
+Reverting the devices we are not sure that works flawlessly.
+
+Reviewed-by: Filipe LaĆns <lains@archlinux.org>
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Jeremy Cline <jcline@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-logitech-hidpp.c | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+--- a/drivers/hid/hid-logitech-hidpp.c
++++ b/drivers/hid/hid-logitech-hidpp.c
+@@ -3749,28 +3749,8 @@ static const struct hid_device_id hidpp_
+
+ { L27MHZ_DEVICE(HID_ANY_ID) },
+
+- { /* Logitech G203/Prodigy Gaming Mouse */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC084) },
+- { /* Logitech G302 Gaming Mouse */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07F) },
+- { /* Logitech G303 Gaming Mouse */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC080) },
+- { /* Logitech G400 Gaming Mouse */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07E) },
+ { /* Logitech G403 Wireless Gaming Mouse over USB */
+ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC082) },
+- { /* Logitech G403 Gaming Mouse */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC083) },
+- { /* Logitech G403 Hero Gaming Mouse over USB */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08F) },
+- { /* Logitech G502 Proteus Core Gaming Mouse */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07D) },
+- { /* Logitech G502 Proteus Spectrum Gaming Mouse over USB */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC332) },
+- { /* Logitech G502 Hero Gaming Mouse over USB */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08B) },
+- { /* Logitech G700s Gaming Mouse over USB */
+- HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07C) },
+ { /* Logitech G703 Gaming Mouse over USB */
+ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC087) },
+ { /* Logitech G703 Hero Gaming Mouse over USB */