Merge remote-tracking branch 'torvalds/master' into perf/core (ab809efa) · Commits · jan.koester / Linux

.mailmap

+2 −0

CREDITS

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author)
	D: APM driver (early port)		D: APM driver (early port)
	D: DRM drivers (author of several)		D: DRM drivers (author of several)

			N: Veaceslav Falico
			E: vfalico@gmail.com
			D: Co-maintainer and co-author of the network bonding driver.

	N: János Farkas		N: János Farkas
	E: chexum@shadow.banki.hu		E: chexum@shadow.banki.hu
	D: romfs, various (mostly networking) fixes		D: romfs, various (mostly networking) fixes
	@@ -2489,6 +2493,13 @@ D: XF86_Mach8
	D: XF86_8514		D: XF86_8514
	D: cfdisk (curses based disk partitioning program)		D: cfdisk (curses based disk partitioning program)

			N: Mat Martineau
			E: mat@martineau.name
			D: MPTCP subsystem co-maintainer 2020-2023
			D: Keyctl restricted keyring and Diffie-Hellman UAPI
			D: Bluetooth L2CAP ERTM mode and AMP
			S: USA

	N: John S. Marvin		N: John S. Marvin
	E: jsm@fc.hp.com		E: jsm@fc.hp.com
	D: PA-RISC port		D: PA-RISC port
	@@ -4172,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu
	S: 16 Baliqiao Nanjie, Beijing 101100		S: 16 Baliqiao Nanjie, Beijing 101100
	S: People's Repulic of China		S: People's Repulic of China

			N: Vlad Yasevich
			E: vyasevich@gmail.com
			D: SCTP protocol maintainer.

	N: Aviad Yehezkel		N: Aviad Yehezkel
	E: aviadye@nvidia.com		E: aviadye@nvidia.com
	D: Kernel TLS implementation and offload support.		D: Kernel TLS implementation and offload support.

Documentation/admin-guide/cgroup-v2.rst

+6 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1245,13 +1245,17 @@ PAGE_SIZE multiple when read back.
	This is a simple interface to trigger memory reclaim in the		This is a simple interface to trigger memory reclaim in the
	target cgroup.		target cgroup.

	This file accepts a string which contains the number of bytes to		This file accepts a single key, the number of bytes to reclaim.
	reclaim.		No nested keys are currently supported.

	Example::		Example::

	echo "1G" > memory.reclaim		echo "1G" > memory.reclaim

			The interface can be later extended with nested keys to
			configure the reclaim behavior. For example, specify the
			type of memory to reclaim from (anon, file, ..).

	Please note that the kernel can over or under reclaim from		Please note that the kernel can over or under reclaim from
	the target cgroup. If less bytes are reclaimed than the		the target cgroup. If less bytes are reclaimed than the
	specified amount, -EAGAIN is returned.		specified amount, -EAGAIN is returned.
	@@ -1263,13 +1267,6 @@ PAGE_SIZE multiple when read back.
	This means that the networking layer will not adapt based on		This means that the networking layer will not adapt based on
	reclaim induced by memory.reclaim.		reclaim induced by memory.reclaim.

	This file also allows the user to specify the nodes to reclaim from,
	via the 'nodes=' key, for example::

	echo "1G nodes=0,1" > memory.reclaim

	The above instructs the kernel to reclaim memory from nodes 0,1.

	memory.peak		memory.peak
	A read-only single value file which exists on non-root		A read-only single value file which exists on non-root
	cgroups.		cgroups.

Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@ properties:
	compatible:		compatible:
	items:		items:
	- enum:		- enum:
	- renesas,i2c-r9a09g011 # RZ/V2M		- renesas,r9a09g011-i2c # RZ/V2M
	- const: renesas,rzv2m-i2c		- const: renesas,rzv2m-i2c

	reg:		reg:
	@@ -66,7 +66,7 @@ examples:
	#include <dt-bindings/interrupt-controller/arm-gic.h>		#include <dt-bindings/interrupt-controller/arm-gic.h>

	i2c0: i2c@a4030000 {		i2c0: i2c@a4030000 {
	compatible = "renesas,i2c-r9a09g011", "renesas,rzv2m-i2c";		compatible = "renesas,r9a09g011-i2c", "renesas,rzv2m-i2c";
	reg = <0xa4030000 0x80>;		reg = <0xa4030000 0x80>;
	interrupts = <GIC_SPI 232 IRQ_TYPE_EDGE_RISING>,		interrupts = <GIC_SPI 232 IRQ_TYPE_EDGE_RISING>,
	<GIC_SPI 236 IRQ_TYPE_EDGE_RISING>;		<GIC_SPI 236 IRQ_TYPE_EDGE_RISING>;

Documentation/devicetree/bindings/regulator/samsung,s2mps14.yaml

+19 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,8 +19,8 @@ description: \|
	additional information and example.		additional information and example.

	patternProperties:		patternProperties:
	# 25 LDOs		# 25 LDOs, without LDO10-12
	"^LDO([1-9]\|[1][0-9]\|2[0-5])$":		"^LDO([1-9]\|1[3-9]\|2[0-5])$":
	type: object		type: object
	$ref: regulator.yaml#		$ref: regulator.yaml#
	unevaluatedProperties: false		unevaluatedProperties: false
	@@ -30,6 +30,23 @@ patternProperties:
	required:		required:
	- regulator-name		- regulator-name

			"^LDO(1[0-2])$":
			type: object
			$ref: regulator.yaml#
			unevaluatedProperties: false
			description:
			Properties for single LDO regulator.

			properties:
			samsung,ext-control-gpios:
			maxItems: 1
			description:
			LDO10, LDO11 and LDO12 can be configured to external control over
			GPIO.

			required:
			- regulator-name

	# 5 bucks		# 5 bucks
	"^BUCK[1-5]$":		"^BUCK[1-5]$":
	type: object		type: object

Original line number	Original line	Diff line number	Diff line
	@@ -130,6 +130,7 @@ 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>
	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>
	Evgeniy Polyakov <johnpol@2ka.mipt.ru>		Evgeniy Polyakov <johnpol@2ka.mipt.ru>
	Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>		Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
	Felipe W Damasio <felipewd@terra.com.br>		Felipe W Damasio <felipewd@terra.com.br>
	@@ -214,6 +215,7 @@ Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
	Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>		Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
	Johan Hovold <johan@kernel.org> <jhovold@gmail.com>		Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
	Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>		Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
			John Crispin <john@phrozen.org> <blogic@openwrt.org>
	John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>		John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
	John Stultz <johnstul@us.ibm.com>		John Stultz <johnstul@us.ibm.com>
	Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>		Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>