diff options
| -rw-r--r-- | .SRCINFO | 32 | ||||
| -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 | 14 |
5 files changed, 115 insertions, 27 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-bfq-mq - pkgver = 4.18.5 - pkgrel = 5 + pkgver = 4.18.6 + pkgrel = 1 url = https://github.com/Algodev-github/bfq-mq/ arch = x86_64 license = GPL2 @@ -11,8 +11,8 @@ pkgbase = linux-bfq-mq makedepends = python-sphinx makedepends = graphviz 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/linux-4.18.6.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.6.tar.sign source = https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.18/bfq-sq-mq/4.18-bfq-sq-mq-v8r12-2K180824.patch source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.18/0100-Check-presence-on-tree-of-every-entity-after-every-a.patch @@ -23,8 +23,9 @@ pkgbase = linux-bfq-mq 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 = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd + sha256sums = 05db97fd6891217af6d4203bdc442ef2af78d7902b6a8e9bd348682704c22894 sha256sums = SKIP sha256sums = 9f7177679c8d3f8d699ef0566a51349d828436dba04603bc2223f98c60d2d178 sha256sums = e59ba36db652bb1d19adaa8984410cf75411863bcdedaa4c486a58cfaa194ad3 @@ -34,8 +35,9 @@ pkgbase = linux-bfq-mq sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = 5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 - sha256sums = 2f91c43b6848cbae2b2c1969323dcaf1c6aace130cd2165c543a7fcf73759aa1 - sha256sums = 31904ff5b35e1bdddaf8a27016179d7c299ce4304b266643957c3cd374e39386 + sha256sums = 1478b5d120eddaf04d9d2242767219b2dd0050ceb87c0f1f14a9ecc86082f290 + sha256sums = 4a5051db31a1a60d3a6588fc98e911640ae008eee8234f140ee84379a49547a5 + sha256sums = d70a20e0370e101d8eead5270086084c6eab67c35093c0f96a7cbd5cac825587 pkgname = linux-bfq-mq pkgdesc = The Linux-bfq-mq kernel and modules with the BFQ-MQ scheduler @@ -46,19 +48,19 @@ pkgname = linux-bfq-mq depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig - provides = linux-bfq-mq=4.18.5 - provides = linux=4.18.5 + provides = linux-bfq-mq=4.18.6 + provides = linux=4.18.6 backup = etc/mkinitcpio.d/linux-bfq-mq.preset pkgname = linux-bfq-mq-headers pkgdesc = Header files and scripts for building modules for Linux-bfq-mq kernel - depends = linux-bfq-mq=4.18.5 - provides = linux-bfq-mq-headers=4.18.5 - provides = linux-headers=4.18.5 + depends = linux-bfq-mq=4.18.6 + provides = linux-bfq-mq-headers=4.18.6 + provides = linux-headers=4.18.6 pkgname = linux-bfq-mq-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-bfq-mq kernel - depends = linux-bfq-mq=4.18.5 - provides = linux-bfq-mq-docs=4.18.5 - provides = linux-docs=4.18.5 + depends = linux-bfq-mq=4.18.6 + provides = linux-bfq-mq-docs=4.18.6 + provides = linux-docs=4.18.6 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,10 +60,10 @@ _1k_HZ_ticks= pkgbase=linux-bfq-mq #pkgbase=linux-custom # Build kernel with a different name _major=4.18 -pkgver=4.18.5 +pkgver=4.18.6 _srcpatch="${pkgver}" _srcname="linux-${pkgver}" -pkgrel=5 +pkgrel=1 arch=('x86_64') url="https://github.com/Algodev-github/bfq-mq/" license=('GPL2') @@ -98,9 +98,10 @@ source=(# mainline kernel patches # 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') -sha256sums=('fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd' +sha256sums=('05db97fd6891217af6d4203bdc442ef2af78d7902b6a8e9bd348682704c22894' 'SKIP' '9f7177679c8d3f8d699ef0566a51349d828436dba04603bc2223f98c60d2d178' 'e59ba36db652bb1d19adaa8984410cf75411863bcdedaa4c486a58cfaa194ad3' @@ -110,8 +111,9 @@ sha256sums=('fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' '5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '2f91c43b6848cbae2b2c1969323dcaf1c6aace130cd2165c543a7fcf73759aa1' - '31904ff5b35e1bdddaf8a27016179d7c299ce4304b266643957c3cd374e39386') + '1478b5d120eddaf04d9d2242767219b2dd0050ceb87c0f1f14a9ecc86082f290' + '4a5051db31a1a60d3a6588fc98e911640ae008eee8234f140ee84379a49547a5' + 'd70a20e0370e101d8eead5270086084c6eab67c35093c0f96a7cbd5cac825587') validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) |