Date: Thursday, September 20, 2018 @ 19:49:52 Author: anthraxx Revision: 335144
upgpkg: linux-hardened 4.18.9.a-1 Modified: linux-hardened/trunk/PKGBUILD linux-hardened/trunk/config.x86_64 Deleted: linux-hardened/trunk/HID-core-fix-grouping-by-application.patch --------------------------------------------+ HID-core-fix-grouping-by-application.patch | 78 --------------------------- PKGBUILD | 13 +--- config.x86_64 | 2 3 files changed, 6 insertions(+), 87 deletions(-) Deleted: HID-core-fix-grouping-by-application.patch =================================================================== --- HID-core-fix-grouping-by-application.patch 2018-09-20 19:16:57 UTC (rev 335143) +++ HID-core-fix-grouping-by-application.patch 2018-09-20 19:49:52 UTC (rev 335144) @@ -1,78 +0,0 @@ -From 20acb01da9443e3ca814bb5d17f01b3fea754010 Mon Sep 17 00:00:00 2001 -From: Benjamin Tissoires <benjamin.tissoi...@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: sta...@vger.kernel.org # v4.18+ -Signed-off-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com> -Signed-off-by: Jiri Kosina <jkos...@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 { Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-20 19:16:57 UTC (rev 335143) +++ PKGBUILD 2018-09-20 19:49:52 UTC (rev 335144) @@ -4,7 +4,7 @@ # Contributor: Thomas Baechler <tho...@archlinux.org> pkgbase=linux-hardened -_pkgver=4.18.8 +_pkgver=4.18.9 _hardenedver=a _srcname=linux-${_pkgver} pkgver=${_pkgver}.${_hardenedver} @@ -21,19 +21,16 @@ 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 ) replaces=('linux-grsec') -sha256sums=('f1551bad69ab617708fa8cf3f94545ae03dd350bdeb3065fbcf39c1a7df85494' +sha256sums=('4c995351e57902a04a94e43796407b4ba295c8eae070c27e99f8f99c321e917a' 'SKIP' - 'f36fcb8d263b7361fe84d2673426d37c4ba5bfbad4e9ebe914579e672586e845' + 'bd77700d2ece09219b50e96e18b646d53675e33bef7055f7adec97ff40e9d3e7' 'SKIP' - 'c7f9d1a2f6dfdbf9d625560681da8dadff50da1ea6b13362e7fb8a1abbd4c286' + '892bf711772a34591e4a0c66dd7a5db3f37ae63c80ff589d87bcc433622e8803' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' - 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '472f606f043b16336f5335021285efe3a7658fb8467917409cb58c9a57a7b0a5') + 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman Modified: config.x86_64 =================================================================== --- config.x86_64 2018-09-20 19:16:57 UTC (rev 335143) +++ config.x86_64 2018-09-20 19:49:52 UTC (rev 335144) @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.8 Kernel Configuration +# Linux/x86 4.18.9 Kernel Configuration # #