From 00c27723a8e308093b6020c8a54c54038d0ab67b Mon Sep 17 00:00:00 2001 From: Mark Weiman Date: Thu, 24 May 2018 12:05:52 -0400 Subject: [PATCH] Update to 4.16.10-1 --- .SRCINFO | 10 +++---- ...evert-swiotlb-remove-various-exports.patch | 29 ------------------- PKGBUILD | 9 ++---- 3 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 0003-Partially-revert-swiotlb-remove-various-exports.patch diff --git a/.SRCINFO b/.SRCINFO index f5cfbb1..6ff6953 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = linux-vfio - pkgver = 4.16.8 + pkgver = 4.16.10 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -12,22 +12,21 @@ pkgbase = linux-vfio options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.8.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.8.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.10.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.10.sign source = config source = 60-linux.hook source = 90-linux.hook 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 source = add-acs-overrides.patch source = i915-vga-arbiter.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 sha256sums = SKIP - sha256sums = 6fb2db1e38f762e6a028dfa5e6d094f0eb4324572667923aca3d64c87117772d + sha256sums = 9fe6093be401fe0ff3f6cb3d428f137119a7befaf86d70f18c7e88871c1852d6 sha256sums = SKIP sha256sums = 8566a49997faf3f8678440c52578a7a0ee901e598d3b67d3bee3799fb92e8f86 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 @@ -35,7 +34,6 @@ pkgbase = linux-vfio sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 7fb607fe384dd814e9e45d7fc28f7b5b23a51d80784c54bf9209486ad428be14 sha256sums = ceaa19e0af3842c62eb666a4ac5c79d89b3e6d00593442f18d6508ca6d74bbaa - sha256sums = 5b397cf9eccdad0c1f2865842c29ba6f4e32ad7dbe4e0c6ef6ca6f07d2963cea sha256sums = abe269c6596b54a412bd8415472153f419026d4f367fa3ee1ebc8693ac66915d sha256sums = fe3d47fe6f54d4a82c869fd29484d3f097b5906ef4d456409961a8dd647daad0 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 7434efb..0000000 --- a/0003-Partially-revert-swiotlb-remove-various-exports.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d39f4cf63fe216321bf105e3062cef3ad5250cd3 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: -From: "Jan Alexander Steffens (heftig)" -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 44f7eb408fdb..0bb1bb65ad6b 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 - diff --git a/PKGBUILD b/PKGBUILD index 19f4a06..8fb9f70 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=linux-vfio _srcname=linux-4.16 -pkgver=4.16.8 +pkgver=4.16.10 pkgrel=1 arch=('x86_64') url="https://www.kernel.org/" @@ -19,7 +19,6 @@ source=( 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 # patches for pci passthrough add-acs-overrides.patch i915-vga-arbiter.patch @@ -30,7 +29,7 @@ validpgpkeys=( ) sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'SKIP' - '6fb2db1e38f762e6a028dfa5e6d094f0eb4324572667923aca3d64c87117772d' + '9fe6093be401fe0ff3f6cb3d428f137119a7befaf86d70f18c7e88871c1852d6' 'SKIP' '8566a49997faf3f8678440c52578a7a0ee901e598d3b67d3bee3799fb92e8f86' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' @@ -38,7 +37,6 @@ sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '7fb607fe384dd814e9e45d7fc28f7b5b23a51d80784c54bf9209486ad428be14' 'ceaa19e0af3842c62eb666a4ac5c79d89b3e6d00593442f18d6508ca6d74bbaa' - '5b397cf9eccdad0c1f2865842c29ba6f4e32ad7dbe4e0c6ef6ca6f07d2963cea' 'abe269c6596b54a412bd8415472153f419026d4f367fa3ee1ebc8693ac66915d' 'fe3d47fe6f54d4a82c869fd29484d3f097b5906ef4d456409961a8dd647daad0') @@ -60,9 +58,6 @@ prepare() { # 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 - # patches for vga arbiter fix in intel systems patch -p1 -i "${srcdir}/i915-vga-arbiter.patch"