Merge "Merge android-4.19.55 (65f49f0) into msm-4.19" (7ece8a38) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/conf.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ needs_sphinx = '1.3'
		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")

Documentation/networking/ip-sysctl.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,14 @@ tcp_base_mss - INTEGER
		Path MTU discovery (MTU probing). If MTU probing is enabled,
		this is the initial MSS used by the connection.

		tcp_min_snd_mss - INTEGER
		TCP SYN and SYNACK messages usually advertise an ADVMSS option,
		as described in RFC 1122 and RFC 6691.
		If this ADVMSS option is smaller than tcp_min_snd_mss,
		it is silently capped to tcp_min_snd_mss.

		Default : 48 (at least 8 bytes of payload per segment)

		tcp_congestion_control - STRING
		Set the congestion control algorithm to be used for new
		connections. The algorithm "reno" is always available, but

Documentation/sphinx/kerneldoc.py

+33 −11

Original line number	Diff line number	Diff line
		@@ -37,8 +37,20 @@ import glob
		from docutils import nodes, statemachine
		from docutils.statemachine import ViewList
		from docutils.parsers.rst import directives, Directive

		#
		# AutodocReporter is only good up to Sphinx 1.7
		#
		import sphinx

		Use_SSI = sphinx.__version__[:3] >= '1.7'
		if Use_SSI:
		from sphinx.util.docutils import switch_source_input
		else:
		from sphinx.ext.autodoc import AutodocReporter

		import kernellog

		__version__ = '1.0'

		class KernelDocDirective(Directive):
		@@ -90,7 +102,8 @@ class KernelDocDirective(Directive):
		cmd += [filename]

		try:
		env.app.verbose('calling kernel-doc \'%s\'' % (" ".join(cmd)))
		kernellog.verbose(env.app,
		'calling kernel-doc \'%s\'' % (" ".join(cmd)))

		p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
		out, err = p.communicate()
		@@ -100,7 +113,8 @@ class KernelDocDirective(Directive):
		if p.returncode != 0:
		sys.stderr.write(err)

		env.app.warn('kernel-doc \'%s\' failed with return code %d' % (" ".join(cmd), p.returncode))
		kernellog.warn(env.app,
		'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)
		@@ -121,21 +135,29 @@ class KernelDocDirective(Directive):
		lineoffset += 1

		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)
		finally:
		self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter = buf
		self.do_parse(result, node)

		return node.children

		except Exception as e: # pylint: disable=W0703
		env.app.warn('kernel-doc \'%s\' processing failed with: %s' %
		kernellog.warn(env.app, 'kernel-doc \'%s\' processing failed with: %s' %
		(" ".join(cmd), str(e)))
		return [nodes.error(None, nodes.paragraph(text = "kernel-doc missing"))]

		def do_parse(self, result, node):
		if Use_SSI:
		with switch_source_input(self.state, result):
		self.state.nested_parse(result, 0, node, match_titles=1)
		else:
		save = 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)
		finally:
		self.state.memo.title_styles, self.state.memo.section_level, self.state.memo.reporter = save


		def setup(app):
		app.add_config_value('kerneldoc_bin', None, 'env')
		app.add_config_value('kerneldoc_srctree', None, 'env')

Documentation/sphinx/kernellog.py

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		#
		# Sphinx has deprecated its older logging interface, but the replacement
		# only goes back to 1.6. So here's a wrapper layer to keep around for
		# as long as we support 1.4.
		#
		import sphinx

		if sphinx.__version__[:3] >= '1.6':
		UseLogging = True
		from sphinx.util import logging
		logger = logging.getLogger('kerneldoc')
		else:
		UseLogging = False

		def warn(app, message):
		if UseLogging:
		logger.warning(message)
		else:
		app.warn(message)

		def verbose(app, message):
		if UseLogging:
		logger.verbose(message)
		else:
		app.verbose(message)

Documentation/sphinx/kfigure.py

+23 −17

Original line number	Diff line number	Diff line
		@@ -60,6 +60,8 @@ import sphinx
		from sphinx.util.nodes import clean_astext
		from six import iteritems

		import kernellog

		PY3 = sys.version_info[0] == 3

		if PY3:
		@@ -171,20 +173,20 @@ def setupTools(app):
		This function is called once, when the builder is initiated.
		"""
		global dot_cmd, convert_cmd # pylint: disable=W0603
		app.verbose("kfigure: check installed tools ...")
		kernellog.verbose(app, "kfigure: check installed tools ...")

		dot_cmd = which('dot')
		convert_cmd = which('convert')

		if dot_cmd:
		app.verbose("use dot(1) from: " + dot_cmd)
		kernellog.verbose(app, "use dot(1) from: " + dot_cmd)
		else:
		app.warn("dot(1) not found, for better output quality install "
		kernellog.warn(app, "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)
		kernellog.verbose(app, "use convert(1) from: " + convert_cmd)
		else:
		app.warn(
		kernellog.warn(app,
		"convert(1) not found, for SVG to PDF conversion install "
		"ImageMagick (https://www.imagemagick.org)")

		@@ -220,12 +222,13 @@ def convert_image(img_node, translator, src_fname=None):

		# in kernel builds, use 'make SPHINXOPTS=-v' to see verbose messages

		app.verbose('assert best format for: ' + img_node['uri'])
		kernellog.verbose(app, '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.")
		kernellog.verbose(app,
		"dot from graphviz not available / include DOT raw.")
		img_node.replace_self(file2literal(src_fname))

		elif translator.builder.format == 'latex':
		@@ -252,7 +255,8 @@ def convert_image(img_node, translator, src_fname=None):

		if translator.builder.format == 'latex':
		if convert_cmd is None:
		app.verbose("no SVG to PDF conversion available / include SVG raw.")
		kernellog.verbose(app,
		"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 +269,19 @@ def convert_image(img_node, translator, src_fname=None):
		_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)
		kernellog.verbose(app,
		"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)
		kernellog.verbose(app, 'convert DOT to: {out}/' + _name)
		ok = dot2format(app, src_fname, dst_fname)

		elif in_ext == '.svg':
		app.verbose('convert SVG to: {out}/' + _name)
		kernellog.verbose(app, 'convert SVG to: {out}/' + _name)
		ok = svg2pdf(app, src_fname, dst_fname)

		if not ok:
		@@ -305,7 +310,8 @@ def dot2format(app, dot_fname, out_fname):
		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)))
		kernellog.warn(app,
		"Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
		return bool(exit_code == 0)

		def svg2pdf(app, svg_fname, pdf_fname):
		@@ -322,7 +328,7 @@ def svg2pdf(app, svg_fname, pdf_fname):
		# 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)))
		kernellog.warn(app, "Error #%d when calling: %s" % (exit_code, " ".join(cmd)))
		return bool(exit_code == 0)


		@@ -415,15 +421,15 @@ def visit_kernel_render(self, node):
		app = self.builder.app
		srclang = node.get('srclang')

		app.verbose('visit kernel-render node lang: "%s"' % (srclang))
		kernellog.verbose(app, '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))
		kernellog.warn(app, '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.")
		kernellog.verbose(app, "dot from graphviz not available / include raw.")
		return

		literal_block = node[0]