Commit 7a7e0197 authored Feb 13, 2025 by Jakub Kicinski

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net



Cross-merge networking fixes after downstream PR (net-6.14-rc3).

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 4079918a 348f968b

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -376,6 +376,7 @@ Juha Yrjola <juha.yrjola@solidboot.com>
		Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
		Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
		Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
		Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
		Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
		Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>
		Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>

CREDITS

+2 −4

Original line number	Diff line number	Diff line
		@@ -2515,11 +2515,9 @@ D: SLS distribution
		D: Initial implementation of VC's, pty's and select()

		N: Pavel Machek
		E: pavel@ucw.cz
		E: pavel@kernel.org
		P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585 B8C7 C060 2241 92DF CE96
		D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
		D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
		D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
		D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,
		D: Altera SoCFPGA and Nokia N900 support.
		S: Czech Republic

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Qualcomm Technologies ath10k wireless devices

		maintainers:
		- Kalle Valo <kvalo@kernel.org>
		- Jeff Johnson <jjohnson@kernel.org>

		description:

Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Qualcomm Technologies ath11k wireless devices (PCIe)

		maintainers:
		- Kalle Valo <kvalo@kernel.org>
		- Jeff Johnson <jjohnson@kernel.org>

		description: \|

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Qualcomm Technologies ath11k wireless devices

		maintainers:
		- Kalle Valo <kvalo@kernel.org>
		- Jeff Johnson <jjohnson@kernel.org>

		description: \|