Sphinx 3 patch, disable CONFIG_SND_CTL_VALIDATION

4 files changed, 21 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5142e0e8f7a..6785267bb4cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,6 +18,7 @@ pkgbase = linux-pds
 	source = git+https://git.archlinux.org/linux?signed#tag=v5.6.3-arch1
 	source = git+https://github.com/graysky2/kernel_gcc_patch
 	source = config
+	source = sphinx-workaround.patch
 	source = 0005-v5.6_undead-pds099o.patch
 	source = 0005-glitched-pds.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
@@ -25,7 +26,8 @@ pkgbase = linux-pds
 	validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = e1a19e8728ce16f239454317cdf94816ec4cdd78e8feb1c459939c1865ed31899c76bc91556a0cea77b88ae13f68b76883ea599d3a5c6718afc81b8212f9dd14
+	sha512sums = c43ca197e5d5ec0473d4f8cce2354020e5808d49716c811b14696a7738b99071fb979fb1056617d59bc90734587c4e9ac123206aeacf07e0ad789ee29618e889
+	sha512sums = 98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be
 	sha512sums = 8f3fce45a43c25800d1efb11010a769eafc0a678ea128d695ef5fe189efe1fe60f0bf16d4d7ff13111bdb2385fdcfb27d554c2d3a93debf2341e5e83224f6153
 	sha512sums = dca2b705810db5e3c3782ac4c11f499e010752055629213ccada09c8e748d20cd1e8c49a93d2e28c5b0c7bf23a2247f0d9858a26d4a56b7cef35108c731cff1c
 
diff --git a/PKGBUILD b/PKGBUILD
index 41b95c33ebd2..feb63b1807fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -92,6 +92,7 @@ source=(
     "git+$_repo_url?signed#tag=$_srcver_tag"
     "git+$_repo_url_gcc_patch"
     config         # the main kernel config file
+    sphinx-workaround.patch
     0005-v5.6_undead-pds099o.patch
     0005-glitched-pds.patch
 )
@@ -102,7 +103,8 @@ validpgpkeys=(
 )
 sha512sums=('SKIP'
             'SKIP'
-            'e1a19e8728ce16f239454317cdf94816ec4cdd78e8feb1c459939c1865ed31899c76bc91556a0cea77b88ae13f68b76883ea599d3a5c6718afc81b8212f9dd14'
+            'c43ca197e5d5ec0473d4f8cce2354020e5808d49716c811b14696a7738b99071fb979fb1056617d59bc90734587c4e9ac123206aeacf07e0ad789ee29618e889'
+            '98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be'
             '8f3fce45a43c25800d1efb11010a769eafc0a678ea128d695ef5fe189efe1fe60f0bf16d4d7ff13111bdb2385fdcfb27d554c2d3a93debf2341e5e83224f6153'
             'dca2b705810db5e3c3782ac4c11f499e010752055629213ccada09c8e748d20cd1e8c49a93d2e28c5b0c7bf23a2247f0d9858a26d4a56b7cef35108c731cff1c')
 
diff --git a/config b/config
index d1a74ace7743..2593bf5ae9d8 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
 #
 
 #
@@ -6678,7 +6678,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']
+