Update to 5.6.9rc1-1

4 files changed, 31 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84dc585eb7de..745cb7fc6db8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-rc
-	pkgver = 5.6.8rc1
+	pkgver = 5.6.9rc1
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -9,19 +9,21 @@ pkgbase = linux-rc
 	makedepends = bc
 	makedepends = libelf
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.6.8-rc1.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.6.8-rc1.sign
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.7.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.7.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.6.9-rc1.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.6.9-rc1.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.8.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.8.tar.sign
 	source = config
+	source = 0000-sphinx-workaround.patch
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = e97661a03a3bd80ae1cc768541fd8bf9d2d304c7e966bcae3d0ac1132d7cabed
+	sha256sums = ee58cb5c58555c97d7b784e783368b6cfd45a646dec8f293d6931855beb51ff3
 	sha256sums = SKIP
-	sha256sums = 23a0420f29eacb66d71f86f64fbd35a1b6ff617d520e3e05f3e1f537d46692ca
+	sha256sums = 19e142ff07a2c8d10116074099b9d845682e74544a2b6c1641f7cb044ac282df
 	sha256sums = SKIP
-	sha256sums = dfd3310bc2d3c4adbaba5e4f2260a8a110706993be1c3e02a5ddfe88bf0c63ce
+	sha256sums = f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21
+	sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
 	sha256sums = 76583cf912c01fdcbca445628ac6e4c03b7f22fda321ee0c7143f3703081650f
 
 pkgname = linux-rc
diff --git a/0000-sphinx-workaround.patch b/0000-sphinx-workaround.patch
new file mode 100644
index 000000000000..1aa3f1c8f66e
--- /dev/null
+++ b/0000-sphinx-workaround.patch
@@ -0,0 +1,13 @@
+diff --git i/Documentation/conf.py w/Documentation/conf.py
+index 3c7bdf4cd31f..9a0ced58a3e9 100644
+--- i/Documentation/conf.py
++++ w/Documentation/conf.py
+@@ -36,7 +36,7 @@ needs_sphinx = '1.3'
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
++extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
+               'kfigure', 'sphinx.ext.ifconfig', 'automarkup',
+               'maintainers_include']
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 3726f26e3ad2..98faf3ea2ae3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.6
 _major=5.6
 ### on initial release this is null otherwise it is the current stable subversion
 ### ie 1,2,3 corresponding $_major.1, $_major.3 etc.
-_minor=7
+_minor=8
 ### on initial release comment this out and set to =1
 _minorc=$((_minor+1))
 #_minorc=1
@@ -30,17 +30,19 @@ source=(
   # "$_rcpatch.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch/?id=$_srcname.y&id2=v${_major}.${_minor}"
   https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_fullver.tar.{xz,sign}
   config         # the main kernel config file
+  0000-sphinx-workaround.patch
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('e97661a03a3bd80ae1cc768541fd8bf9d2d304c7e966bcae3d0ac1132d7cabed'
+sha256sums=('ee58cb5c58555c97d7b784e783368b6cfd45a646dec8f293d6931855beb51ff3'
             'SKIP'
-            '23a0420f29eacb66d71f86f64fbd35a1b6ff617d520e3e05f3e1f537d46692ca'
+            '19e142ff07a2c8d10116074099b9d845682e74544a2b6c1641f7cb044ac282df'
             'SKIP'
-            'dfd3310bc2d3c4adbaba5e4f2260a8a110706993be1c3e02a5ddfe88bf0c63ce'
+            'f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21'
+            '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
             '76583cf912c01fdcbca445628ac6e4c03b7f22fda321ee0c7143f3703081650f')
 
 _kernelname=${pkgbase#linux}
diff --git a/config b/config
index cfa5f4ea3e17..d9ea421800b6 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