Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (9abf2207) · Commits · git / linux-nf

.mailmap

+5 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#
		Aaron Durbin <adurbin@google.com>
		Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
		Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>
		Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
		Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>
		Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
		@@ -207,6 +208,7 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
		Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
		Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
		Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
		Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>
		Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
		David Brownell <david-b@pacbell.net>
		David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
		@@ -794,6 +796,7 @@ Sven Eckelmann <sven@narfation.org> <sven.eckelmann@open-mesh.com>
		Sven Eckelmann <sven@narfation.org> <sven.eckelmann@openmesh.com>
		Sven Eckelmann <sven@narfation.org> <sven@open-mesh.com>
		Sven Peter <sven@kernel.org> <sven@svenpeter.dev>
		Szymon Wilczek <swilczek.lx@gmail.com> <szymonwilczek@gmx.com>
		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
		Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>
		Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>
		@@ -876,6 +879,8 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
		Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
		Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
		Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
		Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
		Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
		Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
		Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
		Yusuke Goda <goda.yusuke@renesas.com>

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -2231,6 +2231,10 @@ S: Markham, Ontario
		S: L3R 8B2
		S: Canada

		N: Krzysztof Kozlowski
		E: krzk@kernel.org
		D: NFC network subsystem and drivers maintainer

		N: Christian Krafft
		D: PowerPC Cell support

Documentation/admin-guide/kernel-parameters.txt

+35 −0

Original line number	Diff line number	Diff line
		@@ -2917,6 +2917,41 @@ Kernel parameters
		for Movable pages. "nn[KMGTPE]", "nn%", and "mirror"
		are exclusive, so you cannot specify multiple forms.

		kfence.burst= [MM,KFENCE] The number of additional successive
		allocations to be attempted through KFENCE for each
		sample interval.
		Format: <unsigned integer>
		Default: 0

		kfence.check_on_panic=
		[MM,KFENCE] Whether to check all KFENCE-managed objects'
		canaries on panic.
		Format: <bool>
		Default: false

		kfence.deferrable=
		[MM,KFENCE] Whether to use a deferrable timer to trigger
		allocations. This avoids forcing CPU wake-ups if the
		system is idle, at the risk of a less predictable
		sample interval.
		Format: <bool>
		Default: CONFIG_KFENCE_DEFERRABLE

		kfence.sample_interval=
		[MM,KFENCE] KFENCE's sample interval in milliseconds.
		Format: <unsigned integer>
		0 - Disable KFENCE.
		>0 - Enabled KFENCE with given sample interval.
		Default: CONFIG_KFENCE_SAMPLE_INTERVAL

		kfence.skip_covered_thresh=
		[MM,KFENCE] If pool utilization reaches this threshold
		(pool usage%), KFENCE limits currently covered
		allocations of the same source from further filling
		up the pool.
		Format: <unsigned integer>
		Default: 75

		kgdbdbgp= [KGDB,HW,EARLY] kgdb over EHCI usb debug port.
		Format: <Controller#>[,poll interval]
		The controller # is the number of the ehci usb debug

Documentation/admin-guide/sysctl/vm.rst

+4 −0

Original line number	Diff line number	Diff line
		@@ -494,6 +494,10 @@ memory allocations.

		The default value depends on CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT.

		When CONFIG_MEM_ALLOC_PROFILING_DEBUG=y, this control is read-only to avoid
		warnings produced by allocations made while profiling is disabled and freed
		when it's enabled.


		memory_failure_early_kill
		=========================

Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.yaml

+9 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,8 @@ properties:
		- brcm,iproc-nic-i2c

		reg:
		maxItems: 1
		minItems: 1
		maxItems: 2

		clock-frequency:
		enum: [ 100000, 400000 ]
		@@ -41,8 +42,15 @@ allOf:
		contains:
		const: brcm,iproc-nic-i2c
		then:
		properties:
		reg:
		minItems: 2
		required:
		- brcm,ape-hsls-addr-mask
		else:
		properties:
		reg:
		maxItems: 1

		unevaluatedProperties: false