diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 20 | ||||
| -rw-r--r-- | 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 16 | ||||
| -rw-r--r-- | 0003-Partially-revert-swiotlb-remove-various-exports.patch | 29 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
5 files changed, 25 insertions, 66 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-bfq-mq pkgver = 4.16.11 - pkgrel = 1 + pkgrel = 2 url = https://github.com/Algodev-github/bfq-mq/ arch = x86_64 license = GPL2 @@ -26,7 +26,6 @@ pkgbase = linux-bfq-mq source = linux.preset source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - source = 0003-Partially-revert-swiotlb-remove-various-exports.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 @@ -43,9 +42,8 @@ pkgbase = linux-bfq-mq sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = 5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 - sha256sums = 286ea6a6f19148ec09d7c07bd80cd08f44a9b8f5821b0732fdbb1dc14ceb539b - sha256sums = ca6590d1368788dff5dd41f2a643ee1dcce4ec9e5ead5caa6e673f68c44851cb - sha256sums = 54f1968c8d2428b8715fda1e6204cf6d918a03e68e60aadad0cb6ead7fcd2081 + sha256sums = 09b98f2d019d71083b30fb06df312eedd4e00cb79f3b77eae95c12052f5b2922 + sha256sums = 74e016f2177f9b17448c09018246891381fd97d979c5d3990678b43bf320c8d5 pkgname = linux-bfq-mq pkgdesc = The Linux-bfq-mq kernel and modules with the BFQ-MQ 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 6748fd65e79c..724b168dc89b 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,8 @@ -From 1d8e17daf031e219d904ef93718081534c9e8cea Mon Sep 17 00:00:00 2001 -Message-Id: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> +From 44c5097b2711429f0d49d138681f67157982e729 Mon Sep 17 00:00:00 2001 +Message-Id: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> 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/2] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> @@ -15,10 +15,10 @@ Signed-off-by: Daniel Micay <danielmicay@gmail.com> 3 files changed, 30 insertions(+) diff --git a/kernel/fork.c b/kernel/fork.c -index e5d9d405ae4e..c4be89c51f25 100644 +index 2295fc69717f..6f320a216e7d 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -103,6 +103,11 @@ +@@ -102,6 +102,11 @@ #define CREATE_TRACE_POINTS #include <trace/events/task.h> @@ -30,7 +30,7 @@ index e5d9d405ae4e..c4be89c51f25 100644 /* * Minimum number of threads to boot the kernel -@@ -1591,6 +1596,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1550,6 +1555,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -41,7 +41,7 @@ index e5d9d405ae4e..c4be89c51f25 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2385,6 +2394,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) +@@ -2343,6 +2352,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -55,7 +55,7 @@ index e5d9d405ae4e..c4be89c51f25 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index f98f28c12020..7256d339a32a 100644 +index 557d46728577..c19d7a828913 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -105,6 +105,9 @@ extern int core_uses_pid; @@ -68,7 +68,7 @@ index f98f28c12020..7256d339a32a 100644 extern int pid_max; extern int pid_max_min, pid_max_max; extern int percpu_pagelist_fraction; -@@ -515,6 +518,15 @@ static struct ctl_table kern_table[] = { +@@ -513,6 +516,15 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif @@ -99,5 +99,5 @@ index 246d4d4ce5c7..f64432b45cec 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.17.0 +2.16.1 diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch index 26953df1687d..d5b2fac689fe 100644 --- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch +++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -1,10 +1,10 @@ -From 97ed8f58f1e019eca30233ffc6a14e6eddac1a36 Mon Sep 17 00:00:00 2001 -Message-Id: <97ed8f58f1e019eca30233ffc6a14e6eddac1a36.1526520264.git.jan.steffens@gmail.com> -In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> -References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> +From 7596bfa5ccb3e3a72443871a4c6d0c4f230c1cb5 Mon Sep 17 00:00:00 2001 +Message-Id: <7596bfa5ccb3e3a72443871a4c6d0c4f230c1cb5.1518653356.git.jan.steffens@gmail.com> +In-Reply-To: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> +References: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> From: Jim Bride <jim.bride@linux.intel.com> Date: Mon, 6 Nov 2017 13:38:57 -0800 -Subject: [PATCH 2/3] drm/i915/edp: Only use the alternate fixed mode if it's +Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's asked for In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for @@ -24,10 +24,10 @@ Signed-off-by: Jim Bride <jim.bride@linux.intel.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index 79521da5d11d..837cbaa55a2b 100644 +index 158438bb0389..69b16df868ea 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -1597,7 +1597,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1, +@@ -1616,7 +1616,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1, m1->vdisplay == m2->vdisplay && m1->vsync_start == m2->vsync_start && m1->vsync_end == m2->vsync_end && @@ -38,5 +38,5 @@ index 79521da5d11d..837cbaa55a2b 100644 } -- -2.17.0 +2.16.1 diff --git a/0003-Partially-revert-swiotlb-remove-various-exports.patch b/0003-Partially-revert-swiotlb-remove-various-exports.patch deleted file mode 100644 index 395a5de207a1..000000000000 --- a/0003-Partially-revert-swiotlb-remove-various-exports.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a4a45daaacca4c48f4f3840a42cf1c8f385c0e82 Mon Sep 17 00:00:00 2001 -Message-Id: <a4a45daaacca4c48f4f3840a42cf1c8f385c0e82.1526520264.git.jan.steffens@gmail.com> -In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> -References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Fri, 6 Apr 2018 16:19:38 +0200 -Subject: [PATCH 3/3] Partially revert "swiotlb: remove various exports" - -This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec. -The proprietary NVIDIA driver needs one of the exports. ---- - lib/swiotlb.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/swiotlb.c b/lib/swiotlb.c -index dc81f16b9095..1c0a8699f8b9 100644 ---- a/lib/swiotlb.c -+++ b/lib/swiotlb.c -@@ -1016,6 +1016,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, - } - return nelems; - } -+EXPORT_SYMBOL(swiotlb_map_sg_attrs); - - /* - * Unmap a set of streaming mode DMA translations. Again, cpu read rules --- -2.17.0 - @@ -65,7 +65,7 @@ pkgbase=linux-bfq-mq pkgver=4.16.11 _srcpatch="${pkgver##*\.*\.}" _srcname="linux-${pkgver%%\.${_srcpatch}}" -pkgrel=1 +pkgrel=2 arch=('x86_64') url="https://github.com/Algodev-github/bfq-mq/" license=('GPL2') @@ -104,8 +104,7 @@ 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-edp-Only-use-the-alternate-fixed-mode-if-it.patch' - '0003-Partially-revert-swiotlb-remove-various-exports.patch') + '0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch') sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'SKIP' @@ -121,9 +120,8 @@ sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' '5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '286ea6a6f19148ec09d7c07bd80cd08f44a9b8f5821b0732fdbb1dc14ceb539b' - 'ca6590d1368788dff5dd41f2a643ee1dcce4ec9e5ead5caa6e673f68c44851cb' - '54f1968c8d2428b8715fda1e6204cf6d918a03e68e60aadad0cb6ead7fcd2081') + '09b98f2d019d71083b30fb06df312eedd4e00cb79f3b77eae95c12052f5b2922' + '74e016f2177f9b17448c09018246891381fd97d979c5d3990678b43bf320c8d5') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -146,14 +144,6 @@ prepare() { ### Fix https://bugs.archlinux.org/task/56711 msg "Fix #56711" patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - - ### Fix https://bugs.archlinux.org/task/58237 - msg "Fix #58237" - patch -Np1 -i ../0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch - - ### NVIDIA driver compat - msg "NVIDIA driver compat" - patch -Np1 -i ../0003-Partially-revert-swiotlb-remove-various-exports.patch ### Fix gcc8 bogus warnings msg "Fix gcc8 bogus warnings" |