Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 15 Feb 2024 22:01:43 +0000 (14:01 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 16 Feb 2024 00:20:04 +0000 (16:20 -0800)
commit73be9a3aabdd976123e7f05dd20dbcf131347e84
tree7b9575df90cae451b7640d53d5e3b3858900a275
parentdfe7f12788f5428d8bc16e86eedcfa889a3e3b29
parent4f5e5092fdbf5cec6bedc19fbe69cce4f5f08372
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

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

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

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

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
27 files changed:
.mailmap
Documentation/netlink/specs/dpll.yaml
MAINTAINERS
drivers/dpll/dpll_netlink.c
drivers/net/bonding/bond_main.c
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
drivers/net/ethernet/mellanox/mlx5/core/dpll.c
drivers/net/ethernet/renesas/ravb_main.c
include/linux/netdevice.h
net/core/dev.c
net/core/rtnetlink.c
net/ipv4/ip_gre.c
net/ipv4/ip_output.c
net/ipv4/ip_tunnel.c
net/ipv4/ip_vti.c
net/ipv4/ipip.c
net/ipv6/sit.c
net/mptcp/options.c
net/mptcp/protocol.c
net/mptcp/protocol.h
net/mptcp/subflow.c
net/sched/act_mirred.c
net/smc/af_smc.c
net/unix/garbage.c
net/xfrm/xfrm_user.c
tools/testing/selftests/net/openvswitch/openvswitch.sh