update to 4.15.15. added latest patches.

5 files changed, 97 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0168b8c09060..8bbd38cc69b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-surface4
-	pkgver = 4.14.2
+	pkgver = 4.14.15
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -10,8 +10,8 @@ pkgbase = linux-surface4
 	makedepends = bc
 	makedepends = libelf
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.2.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.2.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.15.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.15.tar.sign
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
@@ -24,15 +24,15 @@ pkgbase = linux-surface4
 	source = 99-ipts.rules
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = e92690620a4e4811c6b37b2f1b6c9b32a1dde40aa12be6527c8dc215fb27464c
+	sha256sums = ffc393a0c66f80375eacd3fb177b92e5c9daa07de0dcf947e925e049352e6142
 	sha256sums = SKIP
-	sha256sums = efd4cd1ec319e9eed73f67b66de5a761a8365b9b227479f073f9115550cb157c
+	sha256sums = d3890f7442ea8b72c61bbe943527ba252869927a9463a878a41c7e21d6b2b27a
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 	sha256sums = 260859d91e9c77c8231d9ba9f86ab1c970be21da2134efd6b4df139321b80b1d
-	sha256sums = c57e13c8a15d06e4e04cda4ae95c7920cbd8b8b40a17252f2413c8b57da952f3
-	sha256sums = 8d724a67ebb52b5130c855907c17a050a3224ec2fdc11f1544723b5025a36c17
+	sha256sums = fae3adc1b4ff965e8026f02633afadf75c916c817ff48ced41d5d6f637eb89e9
+	sha256sums = ac822d7550a8e4070b5760d7fb86c0e0dba6328a63b85d001f3e19d11a3ed417
 	sha256sums = 835ff847328db11f31d2eb954f45a6067527626dbf984793c44982ef5f60863e
 	sha256sums = 985141fe1d694b95bc78a4b0f3dafcc2cbddabcf2c44eda8feb92847bf9f9c68
 	sha256sums = 82d0fa48947aff93cbbc9a0f0f3020bf95e860d604549b20f7ef8e1634798bd8
diff --git a/0002-hid.patch b/0002-hid.patch
index 467e920b324a..891df4af17f8 100644
--- a/0002-hid.patch
+++ b/0002-hid.patch
@@ -313,3 +313,43 @@ index 6505c97..2d89a42 100644
  	{"", 0},
  };
  MODULE_DEVICE_TABLE(acpi, surface_button_device_ids);
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index e011419cc..ebb9688f9 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -769,6 +769,7 @@
+ #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4	0x07e8
+ #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1	0x07e4
+ #define USB_DEVICE_ID_MS_SURFACE_BOOK		0x07cd
++#define USB_DEVICE_ID_MS_SURFACE_BOOK_2		0x0922
+ #define USB_DEVICE_ID_MS_SURFACE_LAPTOP		0xf001
+ #define USB_DEVICE_ID_MS_POWER_COVER		0x07da
+
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 53cf903b7..4a837b68c 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -1647,6 +1647,11 @@ static const struct hid_device_id mt_devices[] = {
+ 		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
+ 		USB_DEVICE_ID_MS_SURFACE_BOOK) },
+
++	/* Microsoft Surface Book 2 */
++	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
++		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
++		USB_DEVICE_ID_MS_SURFACE_BOOK_2) },
++
+ 	/* Microsoft Power Cover */
+ 	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
+ 		MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
+diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
+index 7b4812094..ff88ddc88 100644
+--- a/drivers/hid/usbhid/hid-quirks.c
++++ b/drivers/hid/usbhid/hid-quirks.c
+@@ -118,6 +118,7 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4, HID_QUIRK_NO_INIT_REPORTS },
+ 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1, HID_QUIRK_NO_INIT_REPORTS },
+ 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK, HID_QUIRK_NO_INIT_REPORTS },
++	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK_2, HID_QUIRK_NO_INIT_REPORTS },
+ 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP, HID_QUIRK_NO_INIT_REPORTS },
+ 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS },
+ 	{ USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },
diff --git a/0003-wifi.patch b/0003-wifi.patch
index 587d799ea142..77e14cecf98f 100644
--- a/0003-wifi.patch
+++ b/0003-wifi.patch
@@ -271,3 +271,42 @@ index 0000000..e78d68c
 + 	return err;
 + }
 +
+diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
+index e11919db7..7f41cf8fe 100644
+--- a/drivers/net/wireless/marvell/mwifiex/init.c
++++ b/drivers/net/wireless/marvell/mwifiex/init.c
+@@ -60,7 +60,7 @@ static void wakeup_timer_fn(unsigned long data)
+ 	adapter->hw_status = MWIFIEX_HW_STATUS_RESET;
+ 	mwifiex_cancel_all_pending_cmd(adapter);
+
+-	if (adapter->if_ops.card_reset && !adapter->hs_activated)
++	if (adapter->if_ops.card_reset)
+ 		adapter->if_ops.card_reset(adapter);
+ }
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
+index 3f2a88167..50df1c05f 100644
+--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
++++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
+@@ -310,6 +310,8 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
+ 		mwifiex_init_shutdown_fw(priv, MWIFIEX_FUNC_SHUTDOWN);
+ 	}
+
++	cancel_work_sync(&card->work);
++
+ 	mwifiex_remove_card(adapter);
+ }
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
+index fd5183c10..832824a89 100644
+--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
++++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
+@@ -399,6 +399,8 @@ mwifiex_sdio_remove(struct sdio_func *func)
+ 		mwifiex_init_shutdown_fw(priv, MWIFIEX_FUNC_SHUTDOWN);
+ 	}
+
++	cancel_work_sync(&card->work);
++
+ 	mwifiex_remove_card(adapter);
+ }
+
diff --git a/PKGBUILD b/PKGBUILD
index 9e0997578af6..9558f9dc6935 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 #pkgbase=linux               # Build stock -ARCH kernel
 pkgbase=linux-surface4      # Build kernel with a different name
-_srcname=linux-4.14.2
-pkgver=4.14.2
+_srcname=linux-4.14.15
+pkgver=4.14.15
 pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
@@ -33,15 +33,15 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('e92690620a4e4811c6b37b2f1b6c9b32a1dde40aa12be6527c8dc215fb27464c'
+sha256sums=('ffc393a0c66f80375eacd3fb177b92e5c9daa07de0dcf947e925e049352e6142'
             'SKIP'
-            'efd4cd1ec319e9eed73f67b66de5a761a8365b9b227479f073f9115550cb157c'
+            'd3890f7442ea8b72c61bbe943527ba252869927a9463a878a41c7e21d6b2b27a'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             '260859d91e9c77c8231d9ba9f86ab1c970be21da2134efd6b4df139321b80b1d'
-            'c57e13c8a15d06e4e04cda4ae95c7920cbd8b8b40a17252f2413c8b57da952f3'
-            '8d724a67ebb52b5130c855907c17a050a3224ec2fdc11f1544723b5025a36c17'
+            'fae3adc1b4ff965e8026f02633afadf75c916c817ff48ced41d5d6f637eb89e9'
+            'ac822d7550a8e4070b5760d7fb86c0e0dba6328a63b85d001f3e19d11a3ed417'
             '835ff847328db11f31d2eb954f45a6067527626dbf984793c44982ef5f60863e'
             '985141fe1d694b95bc78a4b0f3dafcc2cbddabcf2c44eda8feb92847bf9f9c68'
             '82d0fa48947aff93cbbc9a0f0f3020bf95e860d604549b20f7ef8e1634798bd8')
diff --git a/config b/config
index 728fa7741477..e88f281bb430 100644
--- a/config
+++ b/config
@@ -450,6 +450,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
 CONFIG_INTEL_RDT=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
@@ -8077,8 +8078,9 @@ CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 # CONFIG_X86_DEBUG_FPU is not set
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-# CONFIG_FRAME_POINTER_UNWINDER is not set
-CONFIG_ORC_UNWINDER=y
+CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
+# CONFIG_UNWINDER_GUESS is not set
 
 #
 # Security options
@@ -8095,6 +8097,7 @@ CONFIG_SECURITY=y
 # CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set
+CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_PATH=y
 # CONFIG_INTEL_TXT is not set