Merge 6.2-rc5 into driver-core-next (f89fd043) · Commits · jan.koester / Linux

.mailmap

+2 −0

Documentation/admin-guide/mm/zswap.rst

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -70,9 +70,7 @@ e.g. ``zswap.zpool=zbud``. It can also be changed at runtime using the sysfs
	The zbud type zpool allocates exactly 1 page to store 2 compressed pages, which		The zbud type zpool allocates exactly 1 page to store 2 compressed pages, which
	means the compression ratio will always be 2:1 or worse (because of half-full		means the compression ratio will always be 2:1 or worse (because of half-full
	zbud pages). The zsmalloc type zpool has a more complex compressed page		zbud pages). The zsmalloc type zpool has a more complex compressed page
	storage method, and it can achieve greater storage densities. However,		storage method, and it can achieve greater storage densities.
	zsmalloc does not implement compressed page eviction, so once zswap fills it
	cannot evict the oldest page, it can only reject new pages.

	When a swap page is passed from frontswap to zswap, zswap maintains a mapping		When a swap page is passed from frontswap to zswap, zswap maintains a mapping
	of the swap entry, a combination of the swap type and swap offset, to the zpool		of the swap entry, a combination of the swap type and swap offset, to the zpool

Documentation/arm64/silicon-errata.rst

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -120,6 +120,8 @@ stable kernels.
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Cortex-A710 \| #2224489 \| ARM64_ERRATUM_2224489 \|		\| ARM \| Cortex-A710 \| #2224489 \| ARM64_ERRATUM_2224489 \|
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
			\| ARM \| Cortex-A715 \| #2645198 \| ARM64_ERRATUM_2645198 \|
			+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Cortex-X2 \| #2119858 \| ARM64_ERRATUM_2119858 \|		\| ARM \| Cortex-X2 \| #2119858 \| ARM64_ERRATUM_2119858 \|
	+----------------+-----------------+-----------------+-----------------------------+		+----------------+-----------------+-----------------+-----------------------------+
	\| ARM \| Cortex-X2 \| #2224489 \| ARM64_ERRATUM_2224489 \|		\| ARM \| Cortex-X2 \| #2224489 \| ARM64_ERRATUM_2224489 \|

Documentation/conf.py

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,12 @@ def have_command(cmd):
	# Get Sphinx version		# Get Sphinx version
	major, minor, patch = sphinx.version_info[:3]		major, minor, patch = sphinx.version_info[:3]

			#
			# Warn about older versions that we don't want to support for much
			# longer.
			#
			if (major < 2) or (major == 2 and minor < 4):
			print('WARNING: support for Sphinx < 2.4 will be removed soon.')

	# If extensions (or modules to document with autodoc) are in another directory,		# If extensions (or modules to document with autodoc) are in another directory,
	# add these directories to sys.path here. If the directory is relative to the		# add these directories to sys.path here. If the directory is relative to the
	@@ -339,7 +345,11 @@ html_use_smartypants = False

	# Custom sidebar templates, maps document names to template names.		# Custom sidebar templates, maps document names to template names.
	# Note that the RTD theme ignores this		# Note that the RTD theme ignores this
	html_sidebars = { '**': ["about.html", 'searchbox.html', 'localtoc.html', 'sourcelink.html']}		html_sidebars = { '**': ['searchbox.html', 'localtoc.html', 'sourcelink.html']}

			# about.html is available for alabaster theme. Add it at the front.
			if html_theme == 'alabaster':
			html_sidebars['**'].insert(0, 'about.html')

	# Output file base name for HTML help builder.		# Output file base name for HTML help builder.
	htmlhelp_basename = 'TheLinuxKerneldoc'		htmlhelp_basename = 'TheLinuxKerneldoc'

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,17 @@ properties:
	- const: xo		- const: xo
	- const: alternate		- const: alternate

			interrupts:
			minItems: 1
			maxItems: 3

			interrupt-names:
			minItems: 1
			items:
			- const: dcvsh-irq-0
			- const: dcvsh-irq-1
			- const: dcvsh-irq-2

	'#freq-domain-cells':		'#freq-domain-cells':
	const: 1		const: 1

Original line number	Original line	Diff line number	Diff line
	@@ -371,6 +371,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
	Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>		Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
	Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>		Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
	Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>		Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
			Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
	Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>		Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
	Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>		Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
	Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>		Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
	@@ -422,6 +423,7 @@ Tony Luck <tony.luck@intel.com>
	TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>		TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
	TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>		TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
	Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
			Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>
	Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
	Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>		Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
	Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>