Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (272ac32f) · Commits · EulixOS / Software / Kernel

.mailmap

+7 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,10 @@ Arnd Bergmann <arnd@arndb.de>
		Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
		Axel Dyks <xl@xlsigned.net>
		Axel Lin <axel.lin@gmail.com>
		Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@linaro.org>
		Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@spreadtrum.com>
		Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>
		Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>
		Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
		Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
		Ben Gardner <bgardner@wabtec.com>
		@@ -135,6 +139,8 @@ Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
		Frank Zago <fzago@systemfabricworks.com>
		Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
		@@ -371,6 +377,7 @@ Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
		Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
		Sebastian Reichel <sre@kernel.org> <sre@debian.org>
		Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
		Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
		Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Documentation/admin-guide/kernel-parameters.txt

+18 −0

Original line number	Diff line number	Diff line
		@@ -5796,6 +5796,24 @@
		expediting. Set to zero to disable automatic
		expediting.

		srcutree.srcu_max_nodelay [KNL]
		Specifies the number of no-delay instances
		per jiffy for which the SRCU grace period
		worker thread will be rescheduled with zero
		delay. Beyond this limit, worker thread will
		be rescheduled with a sleep delay of one jiffy.

		srcutree.srcu_max_nodelay_phase [KNL]
		Specifies the per-grace-period phase, number of
		non-sleeping polls of readers. Beyond this limit,
		grace period worker thread will be rescheduled
		with a sleep delay of one jiffy, between each
		rescan of the readers, for a grace period phase.

		srcutree.srcu_retry_check_delay [KNL]
		Specifies number of microseconds of non-sleeping
		delay between each non-sleeping poll of readers.

		srcutree.small_contention_lim [KNL]
		Specifies the number of update-side contention
		events per jiffy will be tolerated before

Documentation/devicetree/bindings/net/ethernet-controller.yaml

+59 −64

Original line number	Diff line number	Diff line
		@@ -155,10 +155,8 @@ properties:
		- in-band-status

		fixed-link:
		allOf:
		- if:
		type: array
		then:
		oneOf:
		- $ref: /schemas/types.yaml#/definitions/uint32-array
		deprecated: true
		items:
		- minimum: 0
		@@ -184,11 +182,8 @@ properties:
		description:
		Asymmetric pause configuration. 0 for no asymmetric
		pause, 1 for asymmetric pause


		- if:
		type: object
		then:
		- type: object
		additionalProperties: false
		properties:
		speed:
		description:

Documentation/devicetree/bindings/net/fsl,fec.yaml

+3 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,7 @@ properties:
		Should specify the gpio for phy reset.

		phy-reset-duration:
		$ref: /schemas/types.yaml#/definitions/uint32
		deprecated: true
		description:
		Reset duration in milliseconds. Should present only if property
		@@ -195,12 +196,14 @@ properties:
		and 1 millisecond will be used instead.

		phy-reset-active-high:
		type: boolean
		deprecated: true
		description:
		If present then the reset sequence using the GPIO specified in the
		"phy-reset-gpios" property is reversed (H=reset state, L=operation state).

		phy-reset-post-delay:
		$ref: /schemas/types.yaml#/definitions/uint32
		deprecated: true
		description:
		Post reset delay in milliseconds. If present then a delay of phy-reset-post-delay

Documentation/networking/ip-sysctl.rst

+8 −1

Original line number	Diff line number	Diff line
		@@ -2884,7 +2884,14 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max
		Default: 4K

		sctp_wmem - vector of 3 INTEGERs: min, default, max
		Currently this tunable has no effect.
		Only the first value ("min") is used, "default" and "max" are
		ignored.

		min: Minimum size of send buffer that can be used by SCTP sockets.
		It is guaranteed to each SCTP socket (but not association) even
		under moderate memory pressure.

		Default: 4K

		addr_scope_policy - INTEGER
		Control IPv4 address scoping - draft-stewart-tsvwg-sctp-ipv4-00