main/linux-vanilla: upgrade to 4.14.76

2 files changed, 2 insertions, 73 deletions

diff --git a/main/linux-vanilla/0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch b/main/linux-vanilla/0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
deleted file mode 100644
index ec2a1dd2c5..0000000000
--- a/main/linux-vanilla/0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0a802b5595bc6769a8984ad83662204db79c5e31 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 4 Sep 2017 19:44:18 +0000
-Subject: [PATCH] HID: apple: fix Fn key Magic Keyboard on bluetooth
-
-The vendor id is 0x004c, when Magic Keyboard is connected via bluetooth.
-This appears to be the bluetooth fendor id for Apple.
-
-We also need to check against HID_UP_MSVENDOR to get the Fn key working
-properly.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- drivers/hid/hid-apple.c | 4 +++-
- drivers/hid/hid-core.c  | 1 +
- drivers/hid/hid-ids.h   | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
-index 25b7bd56ae11..c79dbf836925 100644
---- a/drivers/hid/hid-apple.c
-+++ b/drivers/hid/hid-apple.c
-@@ -335,7 +335,7 @@ static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi,
- 		struct hid_field *field, struct hid_usage *usage,
- 		unsigned long **bit, int *max)
- {
--	if (usage->hid == (HID_UP_CUSTOM | 0x0003)) {
-+	if (usage->hid == (HID_UP_CUSTOM | 0x0003) || usage->hid == (HID_UP_MSVENDOR | 0x0003)) {
- 		/* The fn key on Apple USB keyboards */
- 		set_bit(EV_REP, hi->input->evbit);
- 		hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN);
-@@ -472,6 +472,8 @@ static const struct hid_device_id apple_devices[] = {
- 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),
- 		.driver_data = APPLE_HAS_FN },
-+	{ HID_BLUETOOTH_DEVICE(BLUETOOTH_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),
-+		.driver_data = APPLE_HAS_FN },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
- 		.driver_data = APPLE_HAS_FN },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 9017dcc14502..36e43986f415 100644
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1964,6 +1964,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
- 	{ 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(BLUETOOTH_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_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/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index c9ba4c6db74c..3f654444c011 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -85,6 +85,7 @@
- #define USB_DEVICE_ID_ANTON_TOUCH_PAD	0x3101
- 
- #define USB_VENDOR_ID_APPLE		0x05ac
-+#define BLUETOOTH_VENDOR_ID_APPLE	0x004c
- #define USB_DEVICE_ID_APPLE_MIGHTYMOUSE	0x0304
- #define USB_DEVICE_ID_APPLE_MAGICMOUSE	0x030d
- #define USB_DEVICE_ID_APPLE_MAGICTRACKPAD	0x030e
--- 
-2.14.1
-
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index cdc3016bea..f5131f5437 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vanilla
 pkgname=linux-${_flavor}
-pkgver=4.14.74
+pkgver=4.14.76
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -17,9 +17,6 @@ options="!strip"
 _config=${config:-config-vanilla.${CARCH}}
 install=
 source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
-
-	0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
-
 	config-vanilla.aarch64
 	config-vanilla.armhf
 	config-vanilla.x86
@@ -221,7 +218,6 @@ _dev() {
 }
 
 sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8  linux-4.14.tar.xz
-5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782  0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
 2429433ce9e0bbf0a400f6e0a0bc25730a66f74d3365793063252239cfec8fcaa9af5c99d0933f0b239ec9b2e28645bbc05e7e150a90c0a481c2870a03c902e4  config-vanilla.aarch64
 efb7bd5c1b380aa3db62c381c460d20a63f92260d9a6925e9839f8ccb1cce9b3531f56174b633e64a1dd1aaba43c6b23576089f7743143c52ce9301c301a538e  config-vanilla.armhf
 0206981c09a8a3c6f3261b0a6722324629a6d8d4da9872923bb85cb1a43756c95833331c65ef63ec040e86aa8ed616a6623b74c36f1aa98138c0212102814c7f  config-vanilla.x86
@@ -231,4 +227,4 @@ adc20244550d66da34de747a0b7dccf3bbc86a46491e97de4c17e9873c1a4578b7afd31717c0a8ba
 10ecea3e0a101a898e347a42d74f9a3d8f226153cf487e1d65f59fb557b6fdaccab0d2ad6cf705c6cdeb5ed053eb7c5edecc655b3700e4ba237e965c0b6e417e  config-vanilla.s390x
 830f568c91a17cfc57b5458a9b949c343b87ee160a7e27f50010be0ff8e5f80163114b8852dec5a8ce2849ddd99a2530c67dbb818c41a0c69e241fc87e5ff145  config-virt.x86
 5c9b45399dc4477e37e350e763b869a30e3b52815ba60208b805147f16316221d017d0a593f1f2911aeaf89d73f5603e06f7e478b19db4fad49ce15025ec28e6  config-virt.x86_64
-86b6e8ed2a3493e0d97efba5c7c94a7f1c91735fc0b8479ffeb74b894910b317172ec6af37fe5e83ef6b42130fc83da8a299cabc9f5c8ec7f32a72bde8cf1703  patch-4.14.74.xz"
+320a12bba6f98707183a98c7e8a14a2f5e3a4a09a6567fd2315ac4618722d652d15b0cee0f82e4650c66a5bf366467815343d52b5c51dfc92fd2f5900c47659a  patch-4.14.76.xz"