4.14-stable patches

added patches:
	hid-quirks-fix-support-for-apple-magic-keyboards.patch

diff --git a/queue-4.14/hid-quirks-fix-support-for-apple-magic-keyboards.patch b/queue-4.14/hid-quirks-fix-support-for-apple-magic-keyboards.patch
new file mode 100644 (file)
index 0000000..4ce39fe
--- /dev/null
+++ b/queue-4.14/hid-quirks-fix-support-for-apple-magic-keyboards.patch
@@ -0,0 +1,45 @@
+From ncopa@alpinelinux.org  Thu Oct 18 17:16:27 2018
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 18 Oct 2018 17:04:17 +0200
+Subject: HID: quirks: fix support for Apple Magic Keyboards
+To: linux stable <stable@vger.kernel.org>
+Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>, Natanael Copa <ncopa@alpinelinux.org>
+Message-ID: <20181018150417.22354-1-ncopa@alpinelinux.org>
+
+From: Natanael Copa <ncopa@alpinelinux.org>
+
+Commit b6cc0ba2cbf4 (HID: add support for Apple Magic Keyboards)
+backported support for the Magic Keyboard over Bluetooth, but did not
+add the BT_VENDOR_ID_APPLE to hid_have_special_driver[] so the hid-apple
+driver is never loaded and Fn key does not work at all.
+
+Adding BT_VENDOR_ID_APPLE to hid_have_special_driver[] is not needed
+after commit e04a0442d33b (HID: core: remove the absolute need of
+hid_have_special_driver[]), so 4.16 kernels and newer does not need it.
+
+Fixes: b6cc0ba2cbf4 (HID: add support for Apple Magic Keyboards)
+Bugzilla-id: https://bugzilla.kernel.org/show_bug.cgi?id=99881
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+
+Benjamin, thank you for your help with this.
+
+I believe this is needed for both linux-4.14.y and linux-4.9.y.
+
+ drivers/hid/hid-core.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1964,6 +1964,9 @@ static const struct hid_device_id hid_ha
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },
++      { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI) },
++      { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+ #endif

diff --git a/queue-4.14/series b/queue-4.14/series
index 95b5c1c946dd7e83c7fb663df423d980bea16a14..46ae231c967ec0c1a5f942594071b96cfb1b1f36 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -32,3 +32,4 @@ revert-vfs-fix-freeze-protection-in-mnt_want_write_file-for-overlayfs.patch
 mremap-properly-flush-tlb-before-releasing-the-page.patch
 arc-build-get-rid-of-toolchain-check.patch
 arc-build-don-t-set-cross_compile-in-arch-s-makefile.patch
+hid-quirks-fix-support-for-apple-magic-keyboards.patch