Commit a79993b5 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.12-rc8).

Conflicts:

tools/testing/selftests/net/.gitignore
  252e01e6 ("selftests: net: add netlink-dumps to .gitignore")
  be43a6b2 ("selftests: ncdevmem: Move ncdevmem under drivers/net/hw")
https://lore.kernel.org/all/20241113122359.1b95180a@canb.auug.org.au/



drivers/net/phy/phylink.c
  671154f1 ("net: phylink: ensure PHY momentary link-fails are handled")
  7530ea26 ("net: phylink: remove "using_mac_select_pcs"")

Adjacent changes:

drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
  5b366eae ("stmmac: dwmac-intel-plat: fix call balance of tx_clk handling routines")
  e96321fa ("net: ethernet: Switch back to struct platform_driver::remove()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3d12862b cfaaa7d0

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com> 
Thomas Graf <tgraf@suug.ch>

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>

Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>

Tingwei Zhang <quic_tingwei@quicinc.com> <tingwei@codeaurora.org>

Tirupathi Reddy <quic_tirupath@quicinc.com> <tirupath@codeaurora.org>

Documentation/admin-guide/cgroup-v2.rst

+9 −0
Original line number Diff line number Diff line
@@ -1599,6 +1599,15 @@ The following nested keys are defined. 
	  pglazyfreed (npn)

		Amount of reclaimed lazyfree pages



	  swpin_zero

		Number of pages swapped into memory and filled with zero, where I/O

		was optimized out because the page content was detected to be zero

		during swapout.



	  swpout_zero

		Number of zero-filled pages swapped out with I/O skipped due to the

		content being detected as zero.



	  zswpin

		Number of pages moved in to memory from zswap.

Documentation/admin-guide/kernel-parameters.txt

+10 −1
Original line number Diff line number Diff line
@@ -6689,7 +6689,7 @@ 
			0: no polling (default)



	thp_anon=	[KNL]

			Format: <size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>

			Format: <size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>

			state is one of "always", "madvise", "never" or "inherit".

			Control the default behavior of the system with respect

			to anonymous transparent hugepages.
@@ -6728,6 +6728,15 @@ 
	torture.verbose_sleep_duration= [KNL]

			Duration of each verbose-printk() sleep in jiffies.



	tpm.disable_pcr_integrity= [HW,TPM]

			Do not protect PCR registers from unintended physical

			access, or interposers in the bus by the means of

			having an integrity protected session wrapped around

			TPM2_PCR_Extend command. Consider this in a situation

			where TPM is heavily utilized by IMA, thus protection

			causing a major performance hit, and the space where

			machines are deployed is by other means guarded.



	tpm_suspend_pcr=[HW,TPM]

			Format: integer pcr id

			Specify that at suspend time, the tpm driver

Documentation/admin-guide/mm/transhuge.rst

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ control by passing the parameter ``transparent_hugepage=always`` or 
kernel command line.



Alternatively, each supported anonymous THP size can be controlled by

passing ``thp_anon=<size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>``,

passing ``thp_anon=<size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>``,

where ``<size>`` is the THP size (must be a power of 2 of PAGE_SIZE and

supported anonymous THP)  and ``<state>`` is one of ``always``, ``madvise``,

``never`` or ``inherit``.

Documentation/networking/devmem.rst

+9 −0
Original line number Diff line number Diff line
@@ -225,6 +225,15 @@ The user must ensure the tokens are returned to the kernel in a timely manner. 
Failure to do so will exhaust the limited dmabuf that is bound to the RX queue

and will lead to packet drops.



The user must pass no more than 128 tokens, with no more than 1024 total frags

among the token->token_count across all the tokens. If the user provides more

than 1024 frags, the kernel will free up to 1024 frags and return early.



The kernel returns the number of actual frags freed. The number of frags freed

can be less than the tokens provided by the user in case of:



(a) an internal kernel leak bug.

(b) the user passed more than 1024 frags.



Implementation & Caveats

========================