summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorshmilee2019-06-11 13:00:27 +0800
committershmilee2019-06-11 13:00:27 +0800
commitcc6a049e975a098b12cdd0199e21fc9971d212f3 (patch)
tree6fc09add53606ccf019787c25e867873c77e22d2
parent43b0d997949bdd446e11121a680eb33d137d282f (diff)
downloadaur-cc6a049e975a098b12cdd0199e21fc9971d212f3.tar.gz
update to LTS 4.19.49
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD17
-rw-r--r--doc-sphinx-2.patch188
-rw-r--r--drm-i915-maintain-consistent-documentation-subsection-ordering.patch86
-rw-r--r--uksm-patch-for-4.19.37+.patch13
5 files changed, 118 insertions, 200 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1674a8b40f2..03ee68b8d51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by makepkg 5.1.3
-# Tue Apr 23 13:39:59 UTC 2019
+# Tue Jun 11 02:13:42 UTC 2019
pkgbase = linux-shmilee
- pkgver = 4.19.36
+ pkgver = 4.19.49
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -16,14 +16,15 @@ pkgbase = linux-shmilee
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.36.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.49.xz
source = http://ck.kolivas.org/patches/4.0/4.19/4.19-ck1/patch-4.19-ck1.xz
source = ck-patch-for-4.19.7+.patch
source = ck-patch-for-4.19.33+.patch
source = ck-patch-for-4.19.34+.patch
source = https://raw.githubusercontent.com/dolohow/uksm/c4fc85e4e513f97c38806358c472cc45270d936f/uksm-4.19.patch
+ source = uksm-patch-for-4.19.37+.patch
source = linux-cjktty-4.19.patch::https://github.com/torvalds/linux/compare/v4.19...Gentoo-zh:4.19-utf8.patch
- source = doc-sphinx-2.patch
+ source = drm-i915-maintain-consistent-documentation-subsection-ordering.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/plain/queue-5.1/drm-i915-maintain-consistent-documentation-subsection-ordering.patch?id=29167bff7a1c0d79dda104c44c262b0bc4cd6644
source = config
source = 60-linux.hook
source = 90-linux.hook
@@ -32,14 +33,15 @@ pkgbase = linux-shmilee
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
sha256sums = SKIP
- sha256sums = 0703078d84261d098492abaab813a0bab2b408f923d96e66c980f2cdb8d326a8
+ sha256sums = 6db8a2cf4dd3808e4bcf47da5b434de78e2eadb367432db1c4709ac83910117a
sha256sums = 77863d16a08e1b3c726b6c965f1bb7c672bd7317776810121062b73f9ea26780
sha256sums = 58b81803f8f81d18bef9fe3c5101851ca770ca103da114b8d1460ed74d920efa
sha256sums = fb338209c3b3d00ae2e3706eb3b874d5d9391f84120ff5197f95824be76f86e1
sha256sums = 0aafe8360e9a3b9b801ca1327fbfd15b950840d9ddaccd3e7bfc71749e9e3a0c
sha256sums = ec617b1718e6cadfad02c75aca9c4b0e6b6f944bc1a93b7e4d82c847c04b5653
+ sha256sums = fe32296cad05b08b34369ac49a226ae9591890fb106d0c6bc5b8f690f8d553b3
sha256sums = 72be48252f30bc644071bbce2607b773f789c6f19e281b89ab7e16a3d8161ed3
- sha256sums = b2704cb2a90b48df0d9aac1d16e9a3ead41e2bf2e00562526c5b90eff5eecef4
+ sha256sums = 0264c997a4193c7504f0c950373a96f8d0cb5e647bbb5df551ffc91566586b3f
sha256sums = c804c47ecb6d01f29ed4af5bd9c50fa3bb2545ebe9d1c3b560bc6c61a72966f5
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
diff --git a/PKGBUILD b/PKGBUILD
index 44d745111a5..113bafd9d07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
# https://www.kernel.org/category/releases.html
# 4.19 Greg Kroah-Hartman 2018-10-22 2020-12
_LLL_VER=4.19
-_LLL_SUBVER=36
+_LLL_SUBVER=49
# NUMA is optimized for multi-socket motherboards.
# A single multi-core CPU can actually run slower with NUMA enabled.
@@ -36,6 +36,8 @@ _CJKTTY_PATCH="${_CJKTTY_PATCH_FILE}::${_CJKTTY_PATCH_URL}"
_PATHSET_DESC="ck${_CK_VER} uksm-${_UKSM_VER} and cjktty"
+# https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2021842.html
+_drm_i915_sphinx_v2_patch="drm-i915-maintain-consistent-documentation-subsection-ordering.patch"
pkgbase=linux-shmilee
pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
@@ -57,8 +59,9 @@ source=(
'ck-patch-for-4.19.33+.patch'
'ck-patch-for-4.19.34+.patch'
${_UKSM_PATCH}
+ 'uksm-patch-for-4.19.37+.patch'
${_CJKTTY_PATCH}
- 'doc-sphinx-2.patch'
+ "${_drm_i915_sphinx_v2_patch}"
'config' # the main kernel config file
'60-linux.hook' # pacman hook for depmod
'90-linux.hook' # pacman hook for initramfs regeneration
@@ -71,14 +74,15 @@ validpgpkeys=(
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256sums=('0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1'
'SKIP'
- '0703078d84261d098492abaab813a0bab2b408f923d96e66c980f2cdb8d326a8'
+ '6db8a2cf4dd3808e4bcf47da5b434de78e2eadb367432db1c4709ac83910117a'
'77863d16a08e1b3c726b6c965f1bb7c672bd7317776810121062b73f9ea26780'
'58b81803f8f81d18bef9fe3c5101851ca770ca103da114b8d1460ed74d920efa'
'fb338209c3b3d00ae2e3706eb3b874d5d9391f84120ff5197f95824be76f86e1'
'0aafe8360e9a3b9b801ca1327fbfd15b950840d9ddaccd3e7bfc71749e9e3a0c'
'ec617b1718e6cadfad02c75aca9c4b0e6b6f944bc1a93b7e4d82c847c04b5653'
+ 'fe32296cad05b08b34369ac49a226ae9591890fb106d0c6bc5b8f690f8d553b3'
'72be48252f30bc644071bbce2607b773f789c6f19e281b89ab7e16a3d8161ed3'
- 'b2704cb2a90b48df0d9aac1d16e9a3ead41e2bf2e00562526c5b90eff5eecef4'
+ '0264c997a4193c7504f0c950373a96f8d0cb5e647bbb5df551ffc91566586b3f'
'c804c47ecb6d01f29ed4af5bd9c50fa3bb2545ebe9d1c3b560bc6c61a72966f5'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
@@ -107,14 +111,15 @@ prepare() {
msg "Patching source with uksm ${_UKSM_VER} patches"
cp "../uksm-${_LLL_VER}.patch" "../uksm-${_LLL_VER}.${_LLL_SUBVER}.patch"
+ patch -i ../uksm-patch-for-4.19.37+.patch "../uksm-${_LLL_VER}.${_LLL_SUBVER}.patch"
patch -Np1 -i "../uksm-${_LLL_VER}.${_LLL_SUBVER}.patch"
msg "Patching source with Gentoo-zh/linux-cjktty patches"
cp "../${_CJKTTY_PATCH_FILE}" "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
patch -Np1 -i "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
- msg "Patching source with Sphinx-2.0 Documentation build patch"
- patch -Np1 -i ../doc-sphinx-2.patch
+ msg "Patching source with Sphinx-2.0 Documentation build patch"
+ patch -p1 -i ../${_drm_i915_sphinx_v2_patch}
cp -Tf ../config .config
diff --git a/doc-sphinx-2.patch b/doc-sphinx-2.patch
deleted file mode 100644
index fb45d2520b9..00000000000
--- a/doc-sphinx-2.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-diff -Nur a/Documentation/conf.py b/Documentation/conf.py
---- a/Documentation/conf.py 2018-10-22 14:37:37.000000000 +0800
-+++ b/Documentation/conf.py 2019-04-23 21:00:17.000000000 +0800
-@@ -37,7 +37,7 @@
- extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure', 'sphinx.ext.ifconfig']
-
- # The name of the math extension changed on Sphinx 1.4
--if major == 1 and minor > 3:
-+if (major == 1 and minor > 3) or major > 1:
- extensions.append("sphinx.ext.imgmath")
- else:
- extensions.append("sphinx.ext.pngmath")
-diff -Nur a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py
---- a/Documentation/sphinx/kerneldoc.py 2018-10-22 14:37:37.000000000 +0800
-+++ b/Documentation/sphinx/kerneldoc.py 2019-04-23 21:16:41.000000000 +0800
-@@ -37,7 +37,10 @@
- from docutils import nodes, statemachine
- from docutils.statemachine import ViewList
- from docutils.parsers.rst import directives, Directive
--from sphinx.ext.autodoc import AutodocReporter
-+from sphinx.util.docutils import switch_source_input
-+
-+from sphinx.util import logging
-+logger = logging.getLogger(__name__)
-
- __version__ = '1.0'
-
-@@ -90,7 +93,7 @@
- cmd += [filename]
-
- try:
-- env.app.verbose('calling kernel-doc \'%s\'' % (" ".join(cmd)))
-+ logger.verbose('calling kernel-doc \'%s\'' % (" ".join(cmd)))
-
- p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- out, err = p.communicate()
-@@ -100,7 +103,7 @@
- if p.returncode != 0:
- sys.stderr.write(err)
-
-- env.app.warn('kernel-doc \'%s\' failed with return code %d' % (" ".join(cmd), p.returncode))
-+ logger.warning('kernel-doc \'%s\' failed with return code %d' % (" ".join(cmd), p.returncode))
- return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]
- elif env.config.kerneldoc_verbosity > 0:
- sys.stderr.write(err)
-@@ -122,17 +125,17 @@
-
- node = nodes.section()
- buf = self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter
-- self.state.memo.reporter = AutodocReporter(result, self.state.memo.reporter)
- self.state.memo.title_styles, self.state.memo.section_level = [], 0
- try:
-- self.state.nested_parse(result, 0, node, match_titles=1)
-+ with switch_source_input(self.state, result):
-+ self.state.nested_parse(result, 0, node, match_titles=1)
- finally:
- self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter = buf
-
- return node.children
-
- except Exception as e: # pylint: disable=W0703
-- env.app.warn('kernel-doc \'%s\' processing failed with: %s' %
-+ logger.warning('kernel-doc \'%s\' processing failed with: %s' %
- (" ".join(cmd), str(e)))
- return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]
-
-diff -Nur a/Documentation/sphinx/kfigure.py b/Documentation/sphinx/kfigure.py
---- a/Documentation/sphinx/kfigure.py 2018-10-22 14:37:37.000000000 +0800
-+++ b/Documentation/sphinx/kfigure.py 2019-04-23 21:13:32.000000000 +0800
-@@ -60,6 +60,9 @@
- from sphinx.util.nodes import clean_astext
- from six import iteritems
-
-+from sphinx.util import logging
-+logger = logging.getLogger(__name__)
-+
- PY3 = sys.version_info[0] == 3
-
- if PY3:
-@@ -171,20 +174,20 @@
- This function is called once, when the builder is initiated.
- """
- global dot_cmd, convert_cmd # pylint: disable=W0603
-- app.verbose("kfigure: check installed tools ...")
-+ logger.verbose("kfigure: check installed tools ...")
-
- dot_cmd = which('dot')
- convert_cmd = which('convert')
-
- if dot_cmd:
-- app.verbose("use dot(1) from: " + dot_cmd)
-+ logger.verbose("use dot(1) from: " + dot_cmd)
- else:
-- app.warn("dot(1) not found, for better output quality install "
-+ logger.warning("dot(1) not found, for better output quality install "
- "graphviz from http://www.graphviz.org")
- if convert_cmd:
-- app.verbose("use convert(1) from: " + convert_cmd)
-+ logger.verbose("use convert(1) from: " + convert_cmd)
- else:
-- app.warn(
-+ logger.warning(
- "convert(1) not found, for SVG to PDF conversion install "
- "ImageMagick (https://www.imagemagick.org)")
-
-@@ -220,12 +223,12 @@
-
- # in kernel builds, use 'make SPHINXOPTS=-v' to see verbose messages
-
-- app.verbose('assert best format for: ' + img_node['uri'])
-+ logger.verbose('assert best format for: ' + img_node['uri'])
-
- if in_ext == '.dot':
-
- if not dot_cmd:
-- app.verbose("dot from graphviz not available / include DOT raw.")
-+ logger.verbose("dot from graphviz not available / include DOT raw.")
- img_node.replace_self(file2literal(src_fname))
-
- elif translator.builder.format == 'latex':
-@@ -252,7 +255,7 @@
-
- if translator.builder.format == 'latex':
- if convert_cmd is None:
-- app.verbose("no SVG to PDF conversion available / include SVG raw.")
-+ logger.verbose("no SVG to PDF conversion available / include SVG raw.")
- img_node.replace_self(file2literal(src_fname))
- else:
- dst_fname = path.join(translator.builder.outdir, fname + '.pdf')
-@@ -265,18 +268,18 @@
- _name = dst_fname[len(translator.builder.outdir) + 1:]
-
- if isNewer(dst_fname, src_fname):
-- app.verbose("convert: {out}/%s already exists and is newer" % _name)
-+ logger.verbose("convert: {out}/%s already exists and is newer" % _name)
-
- else:
- ok = False
- mkdir(path.dirname(dst_fname))
-
- if in_ext == '.dot':
-- app.verbose('convert DOT to: {out}/' + _name)
-+ logger.verbose('convert DOT to: {out}/' + _name)
- ok = dot2format(app, src_fname, dst_fname)
-
- elif in_ext == '.svg':
-- app.verbose('convert SVG to: {out}/' + _name)
-+ logger.verbose('convert SVG to: {out}/' + _name)
- ok = svg2pdf(app, src_fname, dst_fname)
-
- if not ok:
-@@ -305,7 +308,7 @@
- with open(out_fname, "w") as out:
- exit_code = subprocess.call(cmd, stdout = out)
- if exit_code != 0:
-- app.warn("Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
-+ logger.warning("Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
- return bool(exit_code == 0)
-
- def svg2pdf(app, svg_fname, pdf_fname):
-@@ -322,7 +325,7 @@
- # use stdout and stderr from parent
- exit_code = subprocess.call(cmd)
- if exit_code != 0:
-- app.warn("Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
-+ logger.warning("Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
- return bool(exit_code == 0)
-
-
-@@ -415,15 +418,15 @@
- app = self.builder.app
- srclang = node.get('srclang')
-
-- app.verbose('visit kernel-render node lang: "%s"' % (srclang))
-+ logger.verbose('visit kernel-render node lang: "%s"' % (srclang))
-
- tmp_ext = RENDER_MARKUP_EXT.get(srclang, None)
- if tmp_ext is None:
-- app.warn('kernel-render: "%s" unknown / include raw.' % (srclang))
-+ logger.warning('kernel-render: "%s" unknown / include raw.' % (srclang))
- return
-
- if not dot_cmd and tmp_ext == '.dot':
-- app.verbose("dot from graphviz not available / include raw.")
-+ logger.verbose("dot from graphviz not available / include raw.")
- return
-
- literal_block = node[0]
diff --git a/drm-i915-maintain-consistent-documentation-subsection-ordering.patch b/drm-i915-maintain-consistent-documentation-subsection-ordering.patch
new file mode 100644
index 00000000000..3382dff2767
--- /dev/null
+++ b/drm-i915-maintain-consistent-documentation-subsection-ordering.patch
@@ -0,0 +1,86 @@
+From 551bd3368a7b3cfef01edaade8970948d178d40a Mon Sep 17 00:00:00 2001
+From: Jonathan Corbet <corbet@lwn.net>
+Date: Thu, 23 May 2019 10:06:46 -0600
+Subject: drm/i915: Maintain consistent documentation subsection ordering
+
+From: Jonathan Corbet <corbet@lwn.net>
+
+commit 551bd3368a7b3cfef01edaade8970948d178d40a upstream.
+
+With Sphinx 2.0 (or prior versions with the deprecation warnings fixed) the
+docs build fails with:
+
+ Documentation/gpu/i915.rst:403: WARNING: Title level inconsistent:
+
+ Global GTT Fence Handling
+ ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ reST markup error:
+ Documentation/gpu/i915.rst:403: (SEVERE/4) Title level inconsistent:
+
+I "fixed" it by changing the subsections in i915.rst, but that didn't seem
+like the correct change. It turns out that a couple of i915 files create
+their own subsections in kerneldoc comments using apostrophes as the
+heading marker:
+
+ Layout
+ ''''''
+
+That breaks the normal subsection marker ordering, and newer Sphinx is
+rather more strict about enforcing that ordering. So fix the offending
+comments to make Sphinx happy.
+
+(This is unfortunate, in that kerneldoc comments shouldn't need to be aware
+of where they might be included in the heading hierarchy, but I don't see
+a better way around it).
+
+Cc: stable@vger.kernel.org # v4.14+
+Acked-by: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Jonathan Corbet <corbet@lwn.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/i915_reg.h | 6 +++---
+ drivers/gpu/drm/i915/intel_workarounds.c | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_reg.h
++++ b/drivers/gpu/drm/i915/i915_reg.h
+@@ -32,7 +32,7 @@
+ * macros. Do **not** mass change existing definitions just to update the style.
+ *
+ * Layout
+- * ''''''
++ * ~~~~~~
+ *
+ * Keep helper macros near the top. For example, _PIPE() and friends.
+ *
+@@ -78,7 +78,7 @@
+ * style. Use lower case in hexadecimal values.
+ *
+ * Naming
+- * ''''''
++ * ~~~~~~
+ *
+ * Try to name registers according to the specs. If the register name changes in
+ * the specs from platform to another, stick to the original name.
+@@ -96,7 +96,7 @@
+ * suffix to the name. For example, ``_SKL`` or ``_GEN8``.
+ *
+ * Examples
+- * ''''''''
++ * ~~~~~~~~
+ *
+ * (Note that the values in the example are indented using spaces instead of
+ * TABs to avoid misalignment in generated documentation. Use TABs in the
+--- a/drivers/gpu/drm/i915/intel_workarounds.c
++++ b/drivers/gpu/drm/i915/intel_workarounds.c
+@@ -37,7 +37,7 @@
+ * costly and simplifies things. We can revisit this in the future.
+ *
+ * Layout
+- * ''''''
++ * ~~~~~~
+ *
+ * Keep things in this file ordered by WA type, as per the above (context, GT,
+ * display, register whitelist, batchbuffer). Then, inside each type, keep the
diff --git a/uksm-patch-for-4.19.37+.patch b/uksm-patch-for-4.19.37+.patch
new file mode 100644
index 00000000000..5baa7523c16
--- /dev/null
+++ b/uksm-patch-for-4.19.37+.patch
@@ -0,0 +1,13 @@
+--- uksm-4.19.patch 2019-04-22 22:13:00.000000000 +0800
++++ uksm-4.19.37.patch 2019-05-30 17:34:09.000000000 +0800
+@@ -1194,9 +1194,9 @@
+ #include <linux/pkeys.h>
+ #include <linux/oom.h>
+ +#include <linux/ksm.h>
++ #include <linux/sched/mm.h>
+
+ #include <linux/uaccess.h>
+- #include <asm/cacheflush.h>
+ @@ -182,6 +183,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+ if (vma->vm_file)
+ fput(vma->vm_file);