Sync with Arch

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

4 files changed, 23 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8df69a95e647..10c832595218 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-next-git
 	pkgdesc = Linux NEXT
-	pkgver = 20200406.r0.gb2e2a818a017
+	pkgver = 20200408.r0.g5798bd75ab13
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = x86_64
@@ -16,10 +16,12 @@ pkgbase = linux-next-git
 	options = !strip
 	source = git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
 	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.6/arch-patches-v4/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+	source = sphinx-workaround.patch
 	source = config
 	sha512sums = SKIP
 	sha512sums = 080850eb686f4b8162e348eacc54d6407c810e4430f574a0da009ff851f89e7bc442cfd107a4a4edf009de6dbd83f1cd9ce1c75a2140554b34f35ff0a81c8779
-	sha512sums = 83c1b544c9759060495a66c2225e638ff5584219f735a6f04f6f8f41926e75ddd26abffdf96f2545ee3f7720fe3a2293067f4da52b6b3f6097758298c809d711
+	sha512sums = 98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be
+	sha512sums = 6a9bfb99cbafad5dd1d7835b0e5b4571913a126b9d160c0516b8c15187a852c449d86360b414d8a249b9a43ec8e7ae8bc9365e3cbcda9c953fb5791949356280
 
 pkgname = linux-next-git
 	pkgdesc = The Linux NEXT kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index c74b1790028a..4c2dd3ee7202 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,7 +47,7 @@ _1k_HZ_ticks=
 ### Do not edit below this line unless you know what you're doing
 
 pkgbase=linux-next-git
-pkgver=20200406.r0.gb2e2a818a017
+pkgver=20200408.r0.g5798bd75ab13
 _srcname=linux-next
 pkgrel=1
 pkgdesc='Linux NEXT'
@@ -63,6 +63,7 @@ _lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/${_lucjanver
 
 source=("git://git.kernel.org/pub/scm/linux/kernel/git/next/${_srcname}.git"
         "${_lucjanpath}/arch-patches-v4/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
+        'sphinx-workaround.patch'
          # the main kernel config files
         'config')
 
@@ -310,4 +311,5 @@ done
 
 sha512sums=('SKIP'
             '080850eb686f4b8162e348eacc54d6407c810e4430f574a0da009ff851f89e7bc442cfd107a4a4edf009de6dbd83f1cd9ce1c75a2140554b34f35ff0a81c8779'
-            '83c1b544c9759060495a66c2225e638ff5584219f735a6f04f6f8f41926e75ddd26abffdf96f2545ee3f7720fe3a2293067f4da52b6b3f6097758298c809d711')
+            '98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be'
+            '6a9bfb99cbafad5dd1d7835b0e5b4571913a126b9d160c0516b8c15187a852c449d86360b414d8a249b9a43ec8e7ae8bc9365e3cbcda9c953fb5791949356280')
diff --git a/config b/config
index ebb5cdcc1500..94cfc97455aa 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.2-arch1 Kernel Configuration
+# Linux/x86 5.6.3-arch1 Kernel Configuration
 #
 
 #
@@ -6683,7 +6683,7 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 # CONFIG_SND_DEBUG_VERBOSE is not set
 # CONFIG_SND_PCM_XRUN_DEBUG is not set
-CONFIG_SND_CTL_VALIDATION=y
+# CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_SEQUENCER=m
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
new file mode 100644
index 000000000000..1aa3f1c8f66e
--- /dev/null
+++ b/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']
+