summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--0003-Partially-revert-swiotlb-remove-various-exports.patch29
-rw-r--r--PKGBUILD12
3 files changed, 11 insertions, 48 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 11363da28f10..de9b932a2bfa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Apr 8 07:25:12 UTC 2018
+# Sat Apr 21 00:29:44 UTC 2018
pkgbase = linux-pf
pkgdesc = Linux kernel and modules with the pf-kernel patch (uksm, PDS).
- pkgver = 4.16.1
+ pkgver = 4.16.2
pkgrel = 1
url = https://pfactum.github.io/pf-kernel
arch = i686
@@ -20,18 +20,16 @@ pkgbase = linux-pf
source = config.i686
source = config.x86_64
source = linux.preset
- source = https://github.com/pfactum/pf-kernel/compare/v4.16...v4.16-pf1.diff
+ source = https://github.com/pfactum/pf-kernel/compare/v4.16...v4.16-pf2.diff
source = 90-linux.hook
source = 60-linux.hook
- source = 0003-Partially-revert-swiotlb-remove-various-exports.patch
sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9
sha256sums = 102d518779dc312af35faf7e07ff01df3c04521d40d8757fc4e8eba9c595c395
sha256sums = f38927db126ec7141ea2dd70cabb2ef378552672b31db4ab621493928497abd7
sha256sums = 82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864
- sha256sums = dfa5b3fa715f269eb215585f496536ba2ea8d33992ae13a4190c4df7b1dce7f7
+ sha256sums = a1b811c5dd09a02dd4c852cccee3e6d0aff94d62d2e0ff8f419eeee6b844fa36
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
- sha256sums = d365ce80dab359d5277bd2f8568cad50a30ab269f222ed1bb12b8d74571e24a6
pkgname = linux-pf
pkgdesc = Linux kernel and modules with the pf-kernel patch (uksm, PDS)
@@ -46,7 +44,7 @@ pkgname = linux-pf
optdepends = nvidia-pf: NVIDIA drivers for linux-pf
optdepends = nvidia-beta-all: NVIDIA drivers for all installed kernels
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed. Useful for make localmodconfig.
- provides = linux-pf=4.16.1
+ provides = linux-pf=4.16.2
provides = linux-tomoyo
conflicts = linux-pf
conflicts = kernel26-pf
@@ -55,13 +53,13 @@ pkgname = linux-pf
pkgname = linux-pf-headers
pkgdesc = Header files and scripts for building modules for linux-pf kernel.
depends = linux-pf
- provides = linux-pf-headers=4.16.1
+ provides = linux-pf-headers=4.16.2
conflicts = linux-pf-headers
pkgname = linux-pf-preset-default
pkgdesc = Linux-pf default preset
install = linux.install
- depends = linux-pf=4.16.1
- provides = linux-pf-preset=4.16.1
+ depends = linux-pf=4.16.2
+ provides = linux-pf-preset=4.16.2
backup = etc/mkinitcpio.d/linux-pf.preset
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 ed4e028821f6..000000000000
--- a/0003-Partially-revert-swiotlb-remove-various-exports.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b7c4c2b34e729c1f6f617a8e2aa1dec3e28fdf5c Mon Sep 17 00:00:00 2001
-Message-Id: <b7c4c2b34e729c1f6f617a8e2aa1dec3e28fdf5c.1523024759.git.jan.steffens@gmail.com>
-In-Reply-To: <ed80ff656462322e0bc7813d736800321097e10a.1523024759.git.jan.steffens@gmail.com>
-References: <ed80ff656462322e0bc7813d736800321097e10a.1523024759.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 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
-
diff --git a/PKGBUILD b/PKGBUILD
index 294182f24ba3..597058d68c4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _minor=16
_basekernel=${_major}.${_minor}
_srcname=linux-${_major}.${_minor}
pkgbase=linux-pf
-_pfrel=1
+_pfrel=2
_kernelname=-pf
_pfpatchhome="https://github.com/pfactum/pf-kernel/compare"
_pfpatchname="v$_major.$_minor...v$_major.$_minor-pf$_pfrel.diff"
@@ -83,7 +83,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekerne
"${_pfpatchhome}/${_pfpatchname}" # the -pf patchset
"90-linux.hook"
"60-linux.hook"
- '0003-Partially-revert-swiotlb-remove-various-exports.patch'
)
# 'cx23885_move_CI_AC_registration_to_a_separate_function.patch'
@@ -107,10 +106,6 @@ prepare() {
#patch -Np1 -i ../0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch
# end
-
-
- # NVIDIA driver compat
- patch -Np1 -i ../0003-Partially-revert-swiotlb-remove-various-exports.patch
# end linux-ARCH patches
@@ -687,8 +682,7 @@ sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
'102d518779dc312af35faf7e07ff01df3c04521d40d8757fc4e8eba9c595c395'
'f38927db126ec7141ea2dd70cabb2ef378552672b31db4ab621493928497abd7'
'82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864'
- 'dfa5b3fa715f269eb215585f496536ba2ea8d33992ae13a4190c4df7b1dce7f7'
+ 'a1b811c5dd09a02dd4c852cccee3e6d0aff94d62d2e0ff8f419eeee6b844fa36'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
- 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
- 'd365ce80dab359d5277bd2f8568cad50a30ab269f222ed1bb12b8d74571e24a6')
+ 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21')