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

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

net/core/dev.c
  9f30831390 ("net: add rcu safety to rtnl_prop_list_size()")
  723de3ebef ("net: free altname using an RCU callback")

net/unix/garbage.c
  11498715f2 ("af_unix: Remove io_uring code for GC.")
  25236c91b5 ("af_unix: Fix task hung while purging oob_skb in GC.")

drivers/net/ethernet/renesas/ravb_main.c
  ed4adc0720 ("net: ravb: Count packets instead of descriptors in GbEth RX path"
)
  c2da940857 ("ravb: Add Rx checksum offload support for GbEth")

net/mptcp/protocol.c
  bdd70eb689 ("mptcp: drop the push_pending field")
  28e5c13805 ("mptcp: annotate lockless accesses around read-mostly fields")

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

This commit is contained in:

Jakub Kicinski

2024-02-15 14:01:43 -08:00

parent dfe7f12788 4f5e5092fd

commit 73be9a3aab

396 changed files with 2943 additions and 1872 deletions

									
										net/ipv6/sit.c
									
		+1
		
												View File
												
				@@ -1954,6 +1954,7 @@ xfrm_tunnel_failed:

				module_init(sit_init);

				module_exit(sit_cleanup);

				MODULE_DESCRIPTION("IPv6-in-IPv4 tunnel SIT driver");

				MODULE_LICENSE("GPL");

				MODULE_ALIAS_RTNL_LINK("sit");

				MODULE_ALIAS_NETDEV("sit0");