Merge branch 'i2c/for-current' into i2c/for-mergewindow (38c87827) · Commits · jan.koester / Linux

.gitignore

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -78,6 +78,7 @@ modules.order
	# RPM spec file (make rpm-pkg)		# RPM spec file (make rpm-pkg)
	#		#
	/*.spec		/*.spec
			/rpmbuild/

	#		#
	# Debian directory (make deb-pkg)		# Debian directory (make deb-pkg)

.mailmap

+19 −1

Documentation/admin-guide/index.rst

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,6 @@ problems and bugs in particular.

	reporting-issues		reporting-issues
	reporting-regressions		reporting-regressions
	security-bugs
	bug-hunting		bug-hunting
	bug-bisect		bug-bisect
	tainted-kernels		tainted-kernels

Documentation/admin-guide/reporting-issues.rst

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -395,7 +395,7 @@ might want to be aware of; it for example explains how to add your issue to the
	list of tracked regressions, to ensure it won't fall through the cracks.		list of tracked regressions, to ensure it won't fall through the cracks.

	What qualifies as security issue is left to your judgment. Consider reading		What qualifies as security issue is left to your judgment. Consider reading
	Documentation/admin-guide/security-bugs.rst before proceeding, as it		Documentation/process/security-bugs.rst before proceeding, as it
	provides additional details how to best handle security issues.		provides additional details how to best handle security issues.

	An issue is a 'really severe problem' when something totally unacceptably bad		An issue is a 'really severe problem' when something totally unacceptably bad
	@@ -1269,7 +1269,7 @@ them when sending the report by mail. If you filed it in a bug tracker, forward
	the report's text to these addresses; but on top of it put a small note where		the report's text to these addresses; but on top of it put a small note where
	you mention that you filed it with a link to the ticket.		you mention that you filed it with a link to the ticket.

	See Documentation/admin-guide/security-bugs.rst for more information.		See Documentation/process/security-bugs.rst for more information.


	Duties after the report went out		Duties after the report went out

Documentation/devicetree/bindings/interrupt-controller/loongarch,cpu-interrupt-controller.yaml→Documentation/devicetree/bindings/interrupt-controller/loongson,cpu-interrupt-controller.yaml

+3 −3

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause		# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
	%YAML 1.2		%YAML 1.2
	---		---
	$id: http://devicetree.org/schemas/interrupt-controller/loongarch,cpu-interrupt-controller.yaml#		$id: http://devicetree.org/schemas/interrupt-controller/loongson,cpu-interrupt-controller.yaml#
	$schema: http://devicetree.org/meta-schemas/core.yaml#		$schema: http://devicetree.org/meta-schemas/core.yaml#

	title: LoongArch CPU Interrupt Controller		title: LoongArch CPU Interrupt Controller
	@@ -11,7 +11,7 @@ maintainers:

	properties:		properties:
	compatible:		compatible:
	const: loongarch,cpu-interrupt-controller		const: loongson,cpu-interrupt-controller

	'#interrupt-cells':		'#interrupt-cells':
	const: 1		const: 1
	@@ -28,7 +28,7 @@ required:
	examples:		examples:
	- \|		- \|
	interrupt-controller {		interrupt-controller {
	compatible = "loongarch,cpu-interrupt-controller";		compatible = "loongson,cpu-interrupt-controller";
	#interrupt-cells = <1>;		#interrupt-cells = <1>;
	interrupt-controller;		interrupt-controller;
	};		};

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
	Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>		Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
	Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>		Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
	Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>		Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
			Alexandre Ghiti <alex@ghiti.fr> <alexandre.ghiti@canonical.com>
	Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>		Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
	Alexei Starovoitov <ast@kernel.org> <ast@fb.com>		Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
	Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>		Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
	@@ -121,7 +122,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
	Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
	Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
	<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>		<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
	Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>		Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
	Dmitry Baryshkov <dbaryshkov@gmail.com>		Dmitry Baryshkov <dbaryshkov@gmail.com>
	Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>		Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
	Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>		Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
	@@ -132,6 +133,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
	Domen Puncer <domen@coderock.org>		Domen Puncer <domen@coderock.org>
	Douglas Gilbert <dougg@torque.net>		Douglas Gilbert <dougg@torque.net>
	Ed L. Cashin <ecashin@coraid.com>		Ed L. Cashin <ecashin@coraid.com>
			Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
			Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
	Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>		Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
	Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>		Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
	Evgeniy Polyakov <johnpol@2ka.mipt.ru>		Evgeniy Polyakov <johnpol@2ka.mipt.ru>
	@@ -194,6 +197,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
	Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>		Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
	Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>		Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
	Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>		Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
			Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
	Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>		Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
	Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>		Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
	Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
	@@ -213,6 +217,9 @@ Jens Axboe <axboe@suse.de>
	Jens Osterkamp <Jens.Osterkamp@de.ibm.com>		Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
	Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>		Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
	Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>		Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
			Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
			Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
			Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>