summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2020-01-06 15:17:42 -0800
committerJohn Schoenick2020-01-06 15:17:42 -0800
commit836933ad5bf8cdfe6a4c7ec058151501133b9557 (patch)
treea25baa6faf4c7b221f6b156c101ccdf9bbf3241a
parent58d79429fe9259fb78925dae6884e50e769a9a7d (diff)
parente6bbbc6cd5c0b5f1cdac63b66825b5956c72fb03 (diff)
downloadaur-836933ad5bf8cdfe6a4c7ec058151501133b9557.tar.gz
Merge branch 'upstream' for 5.4.8
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
-rw-r--r--config4
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6faadc4979..335ccd6e426 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-fsync
pkgdesc = Linux
- pkgver = 5.4.3.arch1
+ pkgver = 5.4.8.arch1
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.4.3-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.4.8-arch1
arch = x86_64
license = GPL2
makedepends = bc
@@ -15,14 +15,14 @@ pkgbase = linux-fsync
makedepends = imagemagick
makedepends = git
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.4.3-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.4.8-arch1
source = config
source = futex-wait-multiple-5.2.1.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP
- sha256sums = 5d58a2115892839997ae7dcca226697c34b656de7685cb3eb8696451dc5100a0
+ sha256sums = eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31
sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942
pkgname = linux-fsync
diff --git a/PKGBUILD b/PKGBUILD
index e4ca655b456..728b9670f57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-fsync
-pkgver=5.4.3.arch1
+pkgver=5.4.8.arch1
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -26,7 +26,7 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- '5d58a2115892839997ae7dcca226697c34b656de7685cb3eb8696451dc5100a0'
+ 'eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31'
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942')
export KBUILD_BUILD_HOST=archlinux
diff --git a/config b/config
index dff744f45e2..d5946e50ccd 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.1-arch1 Kernel Configuration
+# Linux/x86 5.4.7-arch1 Kernel Configuration
#
#
@@ -8711,7 +8711,7 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=m
CONFIG_RPMSG_VIRTIO=m
# end of Rpmsg drivers
-CONFIG_SOUNDWIRE=y
+CONFIG_SOUNDWIRE=m
#
# SoundWire Devices