Date: Friday, April 6, 2018 @ 23:33:43 Author: heftig Revision: 321282
4.16-2 Added: linux/trunk/0003-Partially-revert-swiotlb-remove-various-exports.patch Modified: linux/trunk/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch linux/trunk/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch linux/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 6 +- 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 10 +-- 0003-Partially-revert-swiotlb-remove-various-exports.patch | 29 ++++++++++ PKGBUILD | 11 ++- 4 files changed, 45 insertions(+), 11 deletions(-) Modified: 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch =================================================================== --- 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 2018-04-06 23:16:28 UTC (rev 321281) +++ 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 2018-04-06 23:33:43 UTC (rev 321282) @@ -1,8 +1,8 @@ From ed80ff656462322e0bc7813d736800321097e10a Mon Sep 17 00:00:00 2001 -Message-Id: <ed80ff656462322e0bc7813d736800321097e10a.1522624056.git.jan.steff...@gmail.com> +Message-Id: <ed80ff656462322e0bc7813d736800321097e10a.1523024759.git.jan.steff...@gmail.com> From: Serge Hallyn <serge.hal...@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.hal...@ubuntu.com> @@ -99,5 +99,5 @@ static DEFINE_MUTEX(userns_state_mutex); -- -2.16.3 +2.17.0 Modified: 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch =================================================================== --- 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-04-06 23:16:28 UTC (rev 321281) +++ 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-04-06 23:33:43 UTC (rev 321282) @@ -1,10 +1,10 @@ From 7f7ff058a768b93f6a8592f3540471a93aef9a27 Mon Sep 17 00:00:00 2001 -Message-Id: <7f7ff058a768b93f6a8592f3540471a93aef9a27.1522624056.git.jan.steff...@gmail.com> -In-Reply-To: <ed80ff656462322e0bc7813d736800321097e10a.1522624056.git.jan.steff...@gmail.com> -References: <ed80ff656462322e0bc7813d736800321097e10a.1522624056.git.jan.steff...@gmail.com> +Message-Id: <7f7ff058a768b93f6a8592f3540471a93aef9a27.1523024759.git.jan.steff...@gmail.com> +In-Reply-To: <ed80ff656462322e0bc7813d736800321097e10a.1523024759.git.jan.steff...@gmail.com> +References: <ed80ff656462322e0bc7813d736800321097e10a.1523024759.git.jan.steff...@gmail.com> From: Jim Bride <jim.br...@linux.intel.com> Date: Mon, 6 Nov 2017 13:38:57 -0800 -Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's +Subject: [PATCH 2/3] 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 @@ -38,5 +38,5 @@ } -- -2.16.3 +2.17.0 Added: 0003-Partially-revert-swiotlb-remove-various-exports.patch =================================================================== --- 0003-Partially-revert-swiotlb-remove-various-exports.patch (rev 0) +++ 0003-Partially-revert-swiotlb-remove-various-exports.patch 2018-04-06 23:33:43 UTC (rev 321282) @@ -0,0 +1,29 @@ +From b7c4c2b34e729c1f6f617a8e2aa1dec3e28fdf5c Mon Sep 17 00:00:00 2001 +Message-Id: <b7c4c2b34e729c1f6f617a8e2aa1dec3e28fdf5c.1523024759.git.jan.steff...@gmail.com> +In-Reply-To: <ed80ff656462322e0bc7813d736800321097e10a.1523024759.git.jan.steff...@gmail.com> +References: <ed80ff656462322e0bc7813d736800321097e10a.1523024759.git.jan.steff...@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steff...@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 c43ec2271469..77d699f14af7 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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-06 23:16:28 UTC (rev 321281) +++ PKGBUILD 2018-04-06 23:33:43 UTC (rev 321282) @@ -6,7 +6,7 @@ #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-4.16 pkgver=4.16 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="https://www.kernel.org/" license=('GPL2') @@ -21,6 +21,7 @@ linux.preset # standard config files for mkinitcpio ramdisk 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 ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -32,8 +33,9 @@ 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - 'f47b643156811581b31963cf56672f35c5ab275fcb01a3f534577676a4df0bc1' - '971fcb1a89c62333871a7371a488dc78484ed5972230ff3ced31a11ad44714de') + '69be34b14df3275118e8c345d61b36b71370710c7b4f61bb3bedaff7501775f0' + 'a4566321f73fa1448195691349d5ed0ddf30127d17213a31aa2c931e822df061' + 'd365ce80dab359d5277bd2f8568cad50a30ab269f222ed1bb12b8d74571e24a6') _kernelname=${pkgbase#linux} : ${_kernelname:=-ARCH} @@ -53,6 +55,9 @@ # https://bugs.archlinux.org/task/56711 patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch + # NVIDIA driver compat + patch -Np1 -i ../0003-Partially-revert-swiotlb-remove-various-exports.patch + cat ../config - >.config <<END CONFIG_LOCALVERSION="${_kernelname}" CONFIG_LOCALVERSION_AUTO=n