Commit c2702249 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Cross-merge networking fixes after downstream PR (net-6.19-rc6).

No conflicts, or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d4596891 9e995c57

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -473,6 +473,10 @@ Linas Vepstas <linas@austin.ibm.com> 
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>

Linus Walleij <linusw@kernel.org> <linus.walleij@ericsson.com>

Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>

Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>

Linus Walleij <linusw@kernel.org> <triad@df.lth.se>

<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -797,6 +801,7 @@ Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com> 
Tejun Heo <htejun@gmail.com>

Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>

Thomas Graf <tgraf@suug.ch>

Thomas Gleixner <tglx@kernel.org> <tglx@linutronix.de>

Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Pedersen <twp@codeaurora.org>

Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -1398,7 +1398,7 @@ D: SRM environment driver (for Alpha systems) 
P: 1024D/8399E1BB 250D 3BCF 7127 0D8C A444  A961 1DBD 5E75 8399 E1BB



N: Thomas Gleixner

E: tglx@linutronix.de

E: tglx@kernel.org

D: NAND flash hardware support, JFFS2 on NAND flash



N: Jérôme Glisse

Documentation/ABI/stable/sysfs-kernel-time-aux-clocks

+1 −1
Original line number Diff line number Diff line 
What:		/sys/kernel/time/aux_clocks/<ID>/enable

Date:		May 2025

Contact:	Thomas Gleixner <tglx@linutronix.de>

Contact:	Thomas Gleixner <tglx@kernel.org>

Description:

		Controls the enablement of auxiliary clock timekeepers.

Documentation/ABI/testing/sysfs-devices-soc

+2 −2
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ Date: January 2012 
contact:	Lee Jones <lee@kernel.org>

Description:

		Read-only attribute common to all SoCs. Contains the SoC machine

		name (e.g. Ux500).

		name (e.g. DB8500).



What:		/sys/devices/socX/family

Date:		January 2012

contact:	Lee Jones <lee@kernel.org>

Description:

		Read-only attribute common to all SoCs. Contains SoC family name

		(e.g. DB8500).

		(e.g. ux500).



		On many of ARM based silicon with SMCCC v1.2+ compliant firmware

		this will contain the JEDEC JEP106 manufacturer’s identification

Documentation/admin-guide/sysctl/net.rst

+8 −0
Original line number Diff line number Diff line
@@ -303,6 +303,14 @@ netdev_max_backlog 
Maximum number of packets, queued on the INPUT side, when the interface

receives packets faster than kernel can process them.



qdisc_max_burst

------------------



Maximum number of packets that can be temporarily stored before

reaching qdisc.



Default: 1000



netdev_rss_key

--------------