Updated to 4.18.9.a

3 files changed, 8 insertions, 89 deletions

diff --git a/HID-core-fix-grouping-by-application.patch b/HID-core-fix-grouping-by-application.patch
deleted file mode 100644
index 6da2c18..0000000
--- a/HID-core-fix-grouping-by-application.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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] 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 ab93dd5927c3a..a137d2835f328 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 45968f7970f87..1a987345692a6 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 773bcb1d4044e..5482dd6ae9efd 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 {
diff --git a/PKGBUILD b/PKGBUILD
index f5cbcb7..5d37805 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgbase=linux-libre-hardened
 _majver=4.18
-_minver=8
+_minver=9
 _pkgver=${_majver}.${_minver}
 _gnumajver=${_majver}-gnu
 _gnupkgver=${_pkgver}-gnu
@@ -19,6 +19,7 @@ url='https://github.com/anthraxx/linux-hardened'
 arch=('x86_64')
 license=('GPL2')
 makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
+conflicts=('linux-hardened')
 options=('!strip')
 source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
         https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.xz{,.sign}
@@ -29,22 +30,19 @@ source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/lin
         60-linux.hook  # pacman hook for depmod
         90-linux.hook  # pacman hook for initramfs regeneration
         linux.preset   # standard config files for mkinitcpio ramdisk
-
-        HID-core-fix-grouping-by-application.patch
 )
 sha256sums=('55ddf20702311cf3e32127135a38cb272313679962e8a798c108b01cadaeca4f'
             'SKIP'
-            '8a7c03e2961a26c63ec64861ac7c45435f388ed46bf846dcd1ff964a940f1f5c'
+            'f78bc691bd6d8f0d100d079a986722437deeef515782adfb75c067666a166e1a'
             'SKIP'
-            'f36fcb8d263b7361fe84d2673426d37c4ba5bfbad4e9ebe914579e672586e845'
+            'bd77700d2ece09219b50e96e18b646d53675e33bef7055f7adec97ff40e9d3e7'
             'SKIP'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
-            '1932bc26debec57357e0ba73ffa502c3ea1ac26890ab65ef1c6b978ca160ce0b'
+            '4ce45f1db08e83e5ed7a8c9695c282406c1816c09e0c4fca56f3e56c20c5a5d1'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
-            'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            '472f606f043b16336f5335021285efe3a7658fb8467917409cb58c9a57a7b0a5')
+            'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
               '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
@@ -62,8 +60,7 @@ prepare() {
   patch -Np1 < ../patch-${_gnumajver}-${_gnupkgver}
 
   # Hotfixes
-  msg2 "Applying hotfixes"
-  patch -p1 -i ../HID-core-fix-grouping-by-application.patch
+  # msg2 "Applying hotfixes"
 
   # linux hardened patch
   msg2 "Applying hardened patch"
diff --git a/config.x86_64 b/config.x86_64
index 7ac9b95..2404521 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.8 Kernel Configuration
+# Linux/x86 4.18.9 Kernel Configuration
 #
 
 #