Update to 5.6.3.arch1

4 files changed, 37 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bf6f0c8a034..07b1507f5da3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-vfio
 	pkgdesc = Linux
-	pkgver = 5.6.2.arch1
+	pkgver = 5.6.3.arch1
 	pkgrel = 1
-	url = https://git.archlinux.org/linux.git/log/?h=v5.6.2-arch1
+	url = https://git.archlinux.org/linux.git/log/?h=v5.6.3-arch1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -15,17 +15,19 @@ pkgbase = linux-vfio
 	makedepends = imagemagick
 	makedepends = git
 	options = !strip
-	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.2-arch1
+	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.6.3-arch1
 	source = config
 	source = add-acs-overrides.patch
 	source = i915-vga-arbiter.patch
+	source = sphinx-workaround.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
 	sha256sums = SKIP
-	sha256sums = 5c809f7ca4f21ebd95368533b20c0ed78fe2e006762dff742e5fd0751521ad11
+	sha256sums = 6ac452e2124f92747a57c5a50e11ca2f1e8112669845b4431311545c7fd2a36c
 	sha256sums = 4938b7121862e54c614668d1f662fcdd37e0c4f11cf386a425f9d4c3849d00ef
 	sha256sums = 094a29902b52cec2f0840219225a1458ca925f875524ecb7827da62a33c74ccf
+	sha256sums = e2e2e64ed4b716046a999b880fe41def580eca89fb6eb412ed141d2d3c7715da
 
 pkgname = linux-vfio
 	pkgdesc = The Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 6ee47743b451..86aa0088b262 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Upstream: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-vfio
-pkgver=5.6.2.arch1
+pkgver=5.6.3.arch1
 pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -23,6 +23,7 @@ source=(
   config         # the main kernel config file
   add-acs-overrides.patch
   i915-vga-arbiter.patch
+  sphinx-workaround.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -30,9 +31,10 @@ validpgpkeys=(
   '8218F88849AAC522E94CF470A5E9288C4FA415FA'  # Jan Alexander Steffens (heftig)
 )
 sha256sums=('SKIP'
-            '5c809f7ca4f21ebd95368533b20c0ed78fe2e006762dff742e5fd0751521ad11'
+            '6ac452e2124f92747a57c5a50e11ca2f1e8112669845b4431311545c7fd2a36c'
             '4938b7121862e54c614668d1f662fcdd37e0c4f11cf386a425f9d4c3849d00ef'
-            '094a29902b52cec2f0840219225a1458ca925f875524ecb7827da62a33c74ccf')
+            '094a29902b52cec2f0840219225a1458ca925f875524ecb7827da62a33c74ccf'
+            'e2e2e64ed4b716046a999b880fe41def580eca89fb6eb412ed141d2d3c7715da')
 
 
 export KBUILD_BUILD_HOST=archlinux
diff --git a/config b/config
index c6852f9b0c97..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
@@ -10021,7 +10021,7 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="yama"
+CONFIG_LSM="lockdown,yama"
 
 #
 # Kernel hardening options
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
new file mode 100644
index 000000000000..44265cdb3f04
--- /dev/null
+++ b/sphinx-workaround.patch
@@ -0,0 +1,23 @@
+`make htmldocs` is broken again and this is a temporary fix for that. the html
+docs may be malformed but at least it builds without error ¯\_(ツ)_/¯
+
+source: https://bugs.archlinux.org/task/66156#comment188161
+upstream issue: https://github.com/sphinx-doc/sphinx/issues/7421
+
+this should be removed once the issue is resolved. note that there will be a lot
+more errors/warnings than usual due to ripping such an integral part out of
+the docs parser.
+
+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']
+