summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2019-08-27 14:22:35 -0700
committerJohn Schoenick2019-08-27 14:22:35 -0700
commit801979610228abe1982c7e77e072a40357757558 (patch)
tree144768d17c0094550961ab1f9dc80d0874bef7fa
parent9b3681cfb56147b28ac59d459abefb49d48c8a3c (diff)
parenta77c37476a89c775280783bcdbe8e27b8e41be7a (diff)
downloadaur-801979610228abe1982c7e77e072a40357757558.tar.gz
Merge branch 'upstream' for 5.2.10
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD4
-rw-r--r--config4
3 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cff182c06ef..e3c7640f978 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Aug 22 23:39:09 UTC 2019
+# Tue Aug 27 21:22:12 UTC 2019
pkgbase = linux-fsync
- pkgver = 5.2.9.arch1
+ pkgver = 5.2.10.arch1
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.2.9-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.2.10-arch1
arch = x86_64
license = GPL2
makedepends = xmlto
@@ -17,7 +17,7 @@ pkgbase = linux-fsync
makedepends = graphviz
makedepends = imagemagick
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.2.9-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.2.10-arch1
source = config
source = 60-linux.hook
source = 90-linux.hook
@@ -25,7 +25,7 @@ pkgbase = linux-fsync
source = futex-wait-multiple-5.2.1.patch
source = futex-Consolidate-duplicated-timer-setup-code.patch
sha256sums = SKIP
- sha256sums = a40c28cca5451478f1bacd5200bdff7e192c2a95685d4fc0b35730aeb29e35f1
+ sha256sums = e0d0f140128a8574217701e61e874a0a108f3b8cd0f6e35d8b16afe897999f8e
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
diff --git a/PKGBUILD b/PKGBUILD
index 6cb208af855..7ed48a52b42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
#pkgbase=linux # Build stock -ARCH kernel
pkgbase=linux-fsync # Build kernel with a different name
-_srcver=5.2.9-arch1
+_srcver=5.2.10-arch1
pkgver=${_srcver//-/.}
pkgrel=1
arch=(x86_64)
@@ -31,7 +31,7 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- 'a40c28cca5451478f1bacd5200bdff7e192c2a95685d4fc0b35730aeb29e35f1'
+ 'e0d0f140128a8574217701e61e874a0a108f3b8cd0f6e35d8b16afe897999f8e'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/config b/config
index 5e82b0568fc..93349567eae 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.2.5-arch1 Kernel Configuration
+# Linux/x86 5.2.10-arch1 Kernel Configuration
#
#
@@ -8497,7 +8497,7 @@ CONFIG_IOMMU_SUPPORT=y
# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
CONFIG_OF_IOMMU=y
CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_V2=m
+CONFIG_AMD_IOMMU_V2=y
CONFIG_DMAR_TABLE=y
CONFIG_INTEL_IOMMU=y
CONFIG_INTEL_IOMMU_SVM=y