Update to 4.18.7rc1-1

6 files changed, 155 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f0bad8b4838..802dbd4520af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Mon Sep  3 23:13:52 UTC 2018
+# Sat Sep  8 06:02:10 UTC 2018
 pkgbase = linux-rc
-	pkgver = 4.18.6rc1
+	pkgver = 4.18.7rc1
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -11,26 +11,28 @@ pkgbase = linux-rc
 	makedepends = bc
 	makedepends = libelf
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.5.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.5.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.18.6-rc1.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.18.6-rc1.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.6.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.6.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.18.7-rc1.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.18.7-rc1.sign
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
 	source = linux.preset
 	source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
-	source = 0002-Increase-timeout-in-lspcon_wait_mode.patch
-	sha256sums = fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd
+	source = 0002-drm-i915-Increase-LSPCON-timeout.patch
+	source = 0003-HID-core-fix-grouping-by-application.patch
+	sha256sums = 05db97fd6891217af6d4203bdc442ef2af78d7902b6a8e9bd348682704c22894
 	sha256sums = SKIP
-	sha256sums = 5c3bb17a2b78e6001e3745b9174f6ebffaa5945a4814ee39fd9baf19e4165028
+	sha256sums = 270e6a2e468d334cf635eb1411659bf7a642a4437466dadf95a61de206958553
 	sha256sums = SKIP
 	sha256sums = 83d768f19193f6795b8159d81c6775b9f62f4994f2a0d8371ac243e7b0890db8
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
-	sha256sums = 30449a2f7f18eae3bb62e956595c0b8a584d6b998ed7539bde995d6df45c7c4e
-	sha256sums = fddc020ad516100fabc0aa16538d81d5156de377c7a0fbd2dc23b284b9e36cbe
+	sha256sums = 88ebd373a61446b0b157d8493807ee7058d288cd480a48fbc156ca5c5422d203
+	sha256sums = 656da605ca5dad52dcf638d6d2c79d9bdaa48a3e3ea984dc6025da7bac8ded1d
+	sha256sums = 19a3463bce0e0bf23bdd890deffe35bab8e0ce1eb999e23fe6f756ebc87b5059
 
 pkgname = linux-rc
 	pkgdesc = The release candidate kernel and modules
diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index 7ab991e4b844..8c5e92793445 100644
--- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,7 +1,7 @@
-From 30a5ee062a5b7ce1c54125330d3f752b59d6f099 Mon Sep 17 00:00:00 2001
+From 7e7b8d7a0e74d0d4c74abee0334a771458a3ed79 Mon Sep 17 00:00:00 2001
 From: Serge Hallyn <serge.hallyn@canonical.com>
 Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by
+Subject: [PATCH 1/4] add sysctl to disallow unprivileged CLONE_NEWUSER by
  default
 
 Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
diff --git a/0002-Increase-timeout-in-lspcon_wait_mode.patch b/0002-Increase-timeout-in-lspcon_wait_mode.patch
deleted file mode 100644
index 83abafe29648..000000000000
--- a/0002-Increase-timeout-in-lspcon_wait_mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5f8d2a1c7b1c25d18e5b7a40e78be651d14ebfeb Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 13 Aug 2018 00:40:29 +0200
-Subject: [PATCH 2/3] Increase timeout in lspcon_wait_mode
-
-From https://bugs.freedesktop.org/attachment.cgi?id=141051&action=edit
----
- drivers/gpu/drm/i915/intel_lspcon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c
-index 8ae8f42f430a..be1b08f589a4 100644
---- a/drivers/gpu/drm/i915/intel_lspcon.c
-+++ b/drivers/gpu/drm/i915/intel_lspcon.c
-@@ -74,7 +74,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon,
- 	DRM_DEBUG_KMS("Waiting for LSPCON mode %s to settle\n",
- 		      lspcon_mode_name(mode));
- 
--	wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 100);
-+	wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 1000);
- 	if (current_mode != mode)
- 		DRM_ERROR("LSPCON mode hasn't settled\n");
- 
--- 
-2.18.0
-
diff --git a/0002-drm-i915-Increase-LSPCON-timeout.patch b/0002-drm-i915-Increase-LSPCON-timeout.patch
new file mode 100644
index 000000000000..ce28562a17a0
--- /dev/null
+++ b/0002-drm-i915-Increase-LSPCON-timeout.patch
@@ -0,0 +1,50 @@
+From 01d91bc0dac1c22f60fb6d225dcacc7fa9ae2d56 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fredrik=20Sch=C3=B6n?= <fredrikschon@gmail.com>
+Date: Fri, 17 Aug 2018 22:07:28 +0200
+Subject: [PATCH 2/4] drm/i915: Increase LSPCON timeout
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+100 ms is not enough time for the LSPCON adapter on Intel NUC devices to
+settle. This causes dropped display modes at boot or screen reconfiguration.
+Empirical testing can reproduce the error up to a timeout of 190 ms. Basic
+boot and stress testing at 200 ms has not (yet) failed.
+
+Increase timeout to 400 ms to get some margin of error.
+
+Changes from v1:
+The initial suggestion of 1000 ms was lowered due to concerns about delaying
+valid timeout cases.
+Update patch metadata.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107503
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1570392
+Fixes: 357c0ae9198a ("drm/i915/lspcon: Wait for expected LSPCON mode to settle")
+Cc: Shashank Sharma <shashank.sharma@intel.com>
+Cc: Imre Deak <imre.deak@intel.com>
+Cc: Jani Nikula <jani.nikula@intel.com>
+Cc: <stable@vger.kernel.org> # v4.11+
+Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Fredrik Schön <fredrik.schon@gmail.com>
+Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
+---
+ drivers/gpu/drm/i915/intel_lspcon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c
+index 8ae8f42f430a..6b6758419fb3 100644
+--- a/drivers/gpu/drm/i915/intel_lspcon.c
++++ b/drivers/gpu/drm/i915/intel_lspcon.c
+@@ -74,7 +74,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon,
+ 	DRM_DEBUG_KMS("Waiting for LSPCON mode %s to settle\n",
+ 		      lspcon_mode_name(mode));
+ 
+-	wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 100);
++	wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 400);
+ 	if (current_mode != mode)
+ 		DRM_ERROR("LSPCON mode hasn't settled\n");
+ 
+-- 
+2.18.0
+
diff --git a/0003-HID-core-fix-grouping-by-application.patch b/0003-HID-core-fix-grouping-by-application.patch
new file mode 100644
index 000000000000..fb9cb72d6df2
--- /dev/null
+++ b/0003-HID-core-fix-grouping-by-application.patch
@@ -0,0 +1,81 @@
+From 20acb01da9443e3ca814bb5d17f01b3fea754010 Mon Sep 17 00:00:00 2001
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Tue, 4 Sep 2018 15:31:14 +0200
+Subject: [PATCH 3/4] HID: core: fix grouping by application
+
+commit f07b3c1da92d ("HID: generic: create one input report per
+application type") was effectively the same as MULTI_INPUT:
+hidinput->report was never set, so hidinput_match_application()
+always returned null.
+
+Fix that by testing against the real application.
+
+Note that this breaks some old eGalax touchscreens that expect MULTI_INPUT
+instead of HID_QUIRK_INPUT_PER_APP. Enable this quirk for backward
+compatibility on all non-Win8 touchscreens.
+
+link: https://bugzilla.kernel.org/show_bug.cgi?id=200847
+link: https://bugzilla.kernel.org/show_bug.cgi?id=200849
+link: https://bugs.archlinux.org/task/59699
+link: https://github.com/NixOS/nixpkgs/issues/45165
+
+Cc: stable@vger.kernel.org # v4.18+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ drivers/hid/hid-input.c      | 4 ++--
+ drivers/hid/hid-multitouch.c | 3 +++
+ include/linux/hid.h          | 1 +
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
+index ab93dd5927c3..a137d2835f32 100644
+--- a/drivers/hid/hid-input.c
++++ b/drivers/hid/hid-input.c
+@@ -1579,6 +1579,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid,
+ 	input_dev->dev.parent = &hid->dev;
+ 
+ 	hidinput->input = input_dev;
++	hidinput->application = application;
+ 	list_add_tail(&hidinput->list, &hid->inputs);
+ 
+ 	INIT_LIST_HEAD(&hidinput->reports);
+@@ -1674,8 +1675,7 @@ static struct hid_input *hidinput_match_application(struct hid_report *report)
+ 	struct hid_input *hidinput;
+ 
+ 	list_for_each_entry(hidinput, &hid->inputs, list) {
+-		if (hidinput->report &&
+-		    hidinput->report->application == report->application)
++		if (hidinput->application == report->application)
+ 			return hidinput;
+ 	}
+ 
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 45968f7970f8..1a987345692a 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -1476,6 +1476,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
+ 	 */
+ 	hdev->quirks |= HID_QUIRK_INPUT_PER_APP;
+ 
++	if (id->group != HID_GROUP_MULTITOUCH_WIN_8)
++		hdev->quirks |= HID_QUIRK_MULTI_INPUT;
++
+ 	timer_setup(&td->release_timer, mt_expired_timeout, 0);
+ 
+ 	ret = hid_parse(hdev);
+diff --git a/include/linux/hid.h b/include/linux/hid.h
+index 773bcb1d4044..5482dd6ae9ef 100644
+--- a/include/linux/hid.h
++++ b/include/linux/hid.h
+@@ -520,6 +520,7 @@ struct hid_input {
+ 	const char *name;
+ 	bool registered;
+ 	struct list_head reports;	/* the list of reports */
++	unsigned int application;	/* application usage for this input */
+ };
+ 
+ enum hid_type {
+-- 
+2.18.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 7716a1612d77..2788a6fd9fce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 pkgbase=linux-rc
 pkgrel=1
 _srcname=linux-4.18
-_stable=4.18.5
-_patchver=4.18.6
+_stable=4.18.6
+_patchver=4.18.7
 _rcver=1
 pkgver=${_patchver}rc${_rcver}
 _rcpatch=patch-${_patchver}-rc${_rcver}
@@ -23,22 +23,24 @@ source=(
   90-linux.hook  # pacman hook for initramfs regeneration
   linux.preset   # standard config files for mkinitcpio ramdisk
   0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
-  0002-Increase-timeout-in-lspcon_wait_mode.patch
+  0002-drm-i915-Increase-LSPCON-timeout.patch
+  0003-HID-core-fix-grouping-by-application.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd'
+sha256sums=('05db97fd6891217af6d4203bdc442ef2af78d7902b6a8e9bd348682704c22894'
             'SKIP'
-            '5c3bb17a2b78e6001e3745b9174f6ebffaa5945a4814ee39fd9baf19e4165028'
+            '270e6a2e468d334cf635eb1411659bf7a642a4437466dadf95a61de206958553'
             'SKIP'
             '83d768f19193f6795b8159d81c6775b9f62f4994f2a0d8371ac243e7b0890db8'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            '30449a2f7f18eae3bb62e956595c0b8a584d6b998ed7539bde995d6df45c7c4e'
-            'fddc020ad516100fabc0aa16538d81d5156de377c7a0fbd2dc23b284b9e36cbe')
+            '88ebd373a61446b0b157d8493807ee7058d288cd480a48fbc156ca5c5422d203'
+            '656da605ca5dad52dcf638d6d2c79d9bdaa48a3e3ea984dc6025da7bac8ded1d'
+            '19a3463bce0e0bf23bdd890deffe35bab8e0ce1eb999e23fe6f756ebc87b5059')
 
 _kernelname=${pkgbase#linux}