summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2020-05-26 13:31:23 -0700
committerJohn Schoenick2020-05-26 13:31:23 -0700
commita229d11087e0e4c05f96910540db4dbbf6daa4c7 (patch)
treeaa59a1ac3bcfc8685a3a1f7641fcb77378c2c07b
parent052766a55ab37c34da7a575b3c47e1f113ed38c9 (diff)
parent76e517587495547b18af2d0a04b767c1d353105d (diff)
downloadaur-a229d11087e0e4c05f96910540db4dbbf6daa4c7.tar.gz
Merge branch 'upstream' for 5.6.14
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 04e34034987..5d1f05d0923 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-fsync
pkgdesc = Linux
- pkgver = 5.6.10.arch1
+ pkgver = 5.6.14.arch1
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.6.10-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.6.14-arch1
arch = x86_64
license = GPL2
makedepends = bc
@@ -15,13 +15,13 @@ pkgbase = linux-fsync
makedepends = imagemagick
makedepends = git
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.10-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.14-arch1
source = config
source = sphinx-workaround.patch
source = futex-wait-multiple-5.2.1.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
+ validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
sha256sums = SKIP
sha256sums = f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21
sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
diff --git a/PKGBUILD b/PKGBUILD
index 685dd097d95..589cd4da00a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-fsync
-pkgver=5.6.10.arch1
+pkgver=5.6.14.arch1
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -24,7 +24,7 @@ source=(
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
- '8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
+ 'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
'f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21'