Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (6b9fd885) · Commits · git / linux-net

.mailmap

+5 −0

Original line number	Diff line number	Diff line
		@@ -223,6 +223,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
		Domen Puncer <domen@coderock.org>
		Douglas Gilbert <dougg@torque.net>
		Drew Fustini <fustini@kernel.org> <drew@pdp7.com>
		<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
		Ed L. Cashin <ecashin@coraid.com>
		Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
		Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
		@@ -830,3 +832,6 @@ Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
		Yusuke Goda <goda.yusuke@renesas.com>
		Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
		Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>
		Zijun Hu <zijun.hu@oss.qualcomm.com> <quic_zijuhu@quicinc.com>
		Zijun Hu <zijun.hu@oss.qualcomm.com> <zijuhu@codeaurora.org>
		Zijun Hu <zijun_hu@htc.com>

+16 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,12 @@ Description:
		(RO) Supported minimum scrub cycle duration in seconds
		by the memory scrubber.

		Device-based scrub: returns the minimum scrub cycle
		supported by the memory device.

		Region-based scrub: returns the max of minimum scrub cycles
		supported by individual memory devices that back the region.

		What: /sys/bus/edac/devices/<dev-name>/scrubX/max_cycle_duration
		Date: March 2025
		KernelVersion: 6.15
		@@ -57,6 +63,16 @@ Description:
		(RO) Supported maximum scrub cycle duration in seconds
		by the memory scrubber.

		Device-based scrub: returns the maximum scrub cycle supported
		by the memory device.

		Region-based scrub: returns the min of maximum scrub cycles
		supported by individual memory devices that back the region.

		If the memory device does not provide maximum scrub cycle
		information, return the maximum supported value of the scrub
		cycle field.

		What: /sys/bus/edac/devices/<dev-name>/scrubX/current_cycle_duration
		Date: March 2025
		KernelVersion: 6.15

+0 −4

Original line number	Diff line number	Diff line
		@@ -118,15 +118,11 @@ $defs:
		ti,lvds-vod-swing-clock-microvolt:
		description: LVDS diferential output voltage <min max> for clock
		lanes in microvolts.
		$ref: /schemas/types.yaml#/definitions/uint32-array
		minItems: 2
		maxItems: 2

		ti,lvds-vod-swing-data-microvolt:
		description: LVDS diferential output voltage <min max> for data
		lanes in microvolts.
		$ref: /schemas/types.yaml#/definitions/uint32-array
		minItems: 2
		maxItems: 2

		allOf:

+2 −1

Original line number	Diff line number	Diff line
		@@ -80,6 +80,8 @@ examples:
		interrupt-parent = <&intc>;
		interrupts = <296 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-names = "macirq";
		phy-handle = <&phy0>;
		phy-mode = "rgmii-id";
		resets = <&rst 30>;
		reset-names = "stmmaceth";
		snps,multicast-filter-bins = <0>;
		@@ -91,7 +93,6 @@ examples:
		snps,mtl-rx-config = <&gmac0_mtl_rx_setup>;
		snps,mtl-tx-config = <&gmac0_mtl_tx_setup>;
		snps,axi-config = <&gmac0_stmmac_axi_setup>;
		status = "disabled";

		gmac0_mtl_rx_setup: rx-queues-config {
		snps,rx-queues-to-use = <8>;

+1 −1