summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2020-05-05 18:02:07 -0700
committerJohn Schoenick2020-05-05 18:02:07 -0700
commit052766a55ab37c34da7a575b3c47e1f113ed38c9 (patch)
tree8a10e1fd89ebdfb06df02701671549dcca676069
parentee997581d910199dbf274e9f53ccf34e8de9aafd (diff)
parente9416a2318693ca7744e614c976aff5d775fd193 (diff)
downloadaur-052766a55ab37c34da7a575b3c47e1f113ed38c9.tar.gz
Merge branch 'upstream' for 5.6.10
-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 0729911af4d..04e34034987 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-fsync
pkgdesc = Linux
- pkgver = 5.6.5.arch3
+ pkgver = 5.6.10.arch1
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.6.5-arch3
+ url = https://git.archlinux.org/linux.git/log/?h=v5.6.10-arch1
arch = x86_64
license = GPL2
makedepends = bc
@@ -15,7 +15,7 @@ pkgbase = linux-fsync
makedepends = imagemagick
makedepends = git
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.5-arch3
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.10-arch1
source = config
source = sphinx-workaround.patch
source = futex-wait-multiple-5.2.1.patch
@@ -23,7 +23,7 @@ pkgbase = linux-fsync
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP
- sha256sums = dfd3310bc2d3c4adbaba5e4f2260a8a110706993be1c3e02a5ddfe88bf0c63ce
+ sha256sums = f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21
sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942
diff --git a/PKGBUILD b/PKGBUILD
index 90bf20aa299..685dd097d95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-fsync
-pkgver=5.6.5.arch3
+pkgver=5.6.10.arch1
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -27,7 +27,7 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- 'dfd3310bc2d3c4adbaba5e4f2260a8a110706993be1c3e02a5ddfe88bf0c63ce'
+ 'f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21'
'8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942')
diff --git a/config b/config
index cfa5f4ea3e1..d9ea421800b 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.5-arch2 Kernel Configuration
+# Linux/x86 5.6.8-arch1 Kernel Configuration
#
#
@@ -9849,7 +9849,7 @@ CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
CONFIG_NFS_DEBUG=y
-CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y