diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 6 | ||||
| -rw-r--r-- | 0002-drm-i915-Increase-LSPCON-timeout.patch | 9 | ||||
| -rw-r--r-- | 0003-HID-core-fix-grouping-by-application.patch | 81 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
5 files changed, 101 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-rt-bfq pkgver = 4.18.5.3 - pkgrel = 3 + pkgrel = 4 url = https://github.com/Algodev-github/bfq-mq/ arch = x86_64 license = GPL2 @@ -26,6 +26,7 @@ pkgbase = linux-rt-bfq source = linux.preset source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-drm-i915-Increase-LSPCON-timeout.patch + source = 0003-HID-core-fix-grouping-by-application.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 @@ -44,8 +45,9 @@ pkgbase = linux-rt-bfq sha512sums = 4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44 sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74 sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf - sha512sums = 9dac5b65f2af3e4e6d0881e8367a818b67fef81c254e5e8ce971c76edd078516dea913771a77ca54a7c2f25250e29da93a8f4afa55b337b05df0a5bf291e6b03 - sha512sums = 1ab3b2662d521a6d2edcca7b8f466790786c11651fee64020ba5d2b6481fb3539d6556e21b07d0487b059e8214a6bac7e263f2c11693b29a94ce65b1f5b432f4 + sha512sums = 32bfd68f7191c70689a36f66b458f41fcc38f86ea2f580dcf656cd128ba4cc0f333fcdead9877bd873dbcb4cbbd26add9a0e21949b2bdd036e413d1236f3d2a1 + sha512sums = c332fb1a77d1ba6aa682a2c958af9634236edd39c50a93dfa08f5ed5572f38effa4e34730e42b83ef24e9b2ffc0da7244facb25eb282ef03ac2369d562a01ca3 + sha512sums = 125bb9b8a9224e4c62c65f0c33312a793093389104d81fd4d596af7044024523686f44d9f5cb8884c5573b95e3cc77632649a5e7327ae21f436e3e5cbb9e6b75 pkgname = linux-rt-bfq pkgdesc = Linux Kernel and modules with the RT patch and the BFQ scheduler. 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 83bb7fb987b1..5399c3799418 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 b15302036616b5b71c4dce43d3727cc21d98bc07 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/2] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> @@ -98,5 +98,5 @@ index c3d7583fcd21..6ee37e516869 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.18.0.547.g1d89318c4 +2.19.0.rc1 diff --git a/0002-drm-i915-Increase-LSPCON-timeout.patch b/0002-drm-i915-Increase-LSPCON-timeout.patch index 5f5261fb0965..4461ed3d9a75 100644 --- a/0002-drm-i915-Increase-LSPCON-timeout.patch +++ b/0002-drm-i915-Increase-LSPCON-timeout.patch @@ -1,7 +1,7 @@ -From 4e09b725c6fa6530385d97363346e72a26d418be Mon Sep 17 00:00:00 2001 +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/2] drm/i915: Increase LSPCON timeout +Subject: [PATCH 2/3] drm/i915: Increase LSPCON timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -33,7 +33,7 @@ Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> 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 8ae8f42f430a1..6b6758419fb34 100644 +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, @@ -45,3 +45,6 @@ index 8ae8f42f430a1..6b6758419fb34 100644 if (current_mode != mode) DRM_ERROR("LSPCON mode hasn't settled\n"); +-- +2.19.0.rc1 + 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..423d59dcfe9a --- /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/3] 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.19.0.rc1 + @@ -60,7 +60,7 @@ pkgver=${_major}.${_minor}.${_rtver} _pkgver=${_major}.${_minor} _srcname=linux-${_pkgver} _rtpatchver=rt${_rtver} -pkgrel=3 +pkgrel=4 arch=('x86_64') url="https://github.com/Algodev-github/bfq-mq/" license=('GPL2') @@ -94,7 +94,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" # standard config files for mkinitcpio ramdisk 'linux.preset' '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch' - '0002-drm-i915-Increase-LSPCON-timeout.patch') + '0002-drm-i915-Increase-LSPCON-timeout.patch' + '0003-HID-core-fix-grouping-by-application.patch') _kernelname=${pkgbase#linux} : ${_kernelname:=-rt-bfq} @@ -402,8 +403,9 @@ sha512sums=('604b334ccd74b230faf21db8887e382c49d4877ec8ce8298c079001a12222a6c7be '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' '6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' - '9dac5b65f2af3e4e6d0881e8367a818b67fef81c254e5e8ce971c76edd078516dea913771a77ca54a7c2f25250e29da93a8f4afa55b337b05df0a5bf291e6b03' - '1ab3b2662d521a6d2edcca7b8f466790786c11651fee64020ba5d2b6481fb3539d6556e21b07d0487b059e8214a6bac7e263f2c11693b29a94ce65b1f5b432f4') + '32bfd68f7191c70689a36f66b458f41fcc38f86ea2f580dcf656cd128ba4cc0f333fcdead9877bd873dbcb4cbbd26add9a0e21949b2bdd036e413d1236f3d2a1' + 'c332fb1a77d1ba6aa682a2c958af9634236edd39c50a93dfa08f5ed5572f38effa4e34730e42b83ef24e9b2ffc0da7244facb25eb282ef03ac2369d562a01ca3' + '125bb9b8a9224e4c62c65f0c33312a793093389104d81fd4d596af7044024523686f44d9f5cb8884c5573b95e3cc77632649a5e7327ae21f436e3e5cbb9e6b75') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds |