Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 29 Feb 2024 22:17:54 +0000 (14:17 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 29 Feb 2024 22:24:56 +0000 (14:24 -0800)
commit65f5dd4f02a89df429b8212b4c2f3ada6c4f3fc1
tree4c201974fa7e35e99c530ab3d0429dc894d64cf3
parent489645d3f1332f65a9337cb31c0ee12a1259a484
parent87adedeba51a822533649b143232418b9e26d08b
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

net/mptcp/protocol.c
  adf1bb78dab5 ("mptcp: fix snd_wnd initialization for passive socket")
  9426ce476a70 ("mptcp: annotate lockless access for RX path fields")
https://lore.kernel.org/all/20240228103048.19255709@canb.auug.org.au/

Adjacent changes:

drivers/dpll/dpll_core.c
  0d60d8df6f49 ("dpll: rely on rcu for netdev_dpll_pin()")
  e7f8df0e81bf ("dpll: move xa_erase() call in to match dpll_pin_alloc() error path order")

drivers/net/veth.c
  1ce7d306ea63 ("veth: try harder when allocating queue memory")
  0bef512012b1 ("net: add netdev_lockdep_set_classes() to virtual drivers")

drivers/net/wireless/intel/iwlwifi/mvm/d3.c
  8c9bef26e98b ("wifi: iwlwifi: mvm: d3: implement suspend with MLO")
  78f65fbf421a ("wifi: iwlwifi: mvm: ensure offloading TID queue exists")

net/wireless/nl80211.c
  f78c1375339a ("wifi: nl80211: reject iftype change with mesh ID change")
  414532d8aa89 ("wifi: cfg80211: use IEEE80211_MAX_MESH_ID_LEN appropriately")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
42 files changed:
.mailmap
MAINTAINERS
drivers/dpll/dpll_core.c
drivers/net/ethernet/intel/ice/ice_base.c
drivers/net/ethernet/intel/ice/ice_dpll.c
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/ice/ice_lib.h
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
drivers/net/ethernet/pensando/ionic/ionic_lif.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/toshiba/ps3_gelic_net.c
drivers/net/gtp.c
drivers/net/tun.c
drivers/net/usb/lan78xx.c
drivers/net/veth.c
drivers/net/wireless/intel/iwlwifi/mvm/d3.c
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.h
include/linux/dpll.h
include/linux/netdevice.h
include/linux/netfilter.h
include/net/mctp.h
net/core/dev.c
net/core/rtnetlink.c
net/ipv4/ip_tunnel.c
net/ipv6/addrconf.c
net/mac80211/rate.c
net/mctp/route.c
net/mptcp/options.c
net/mptcp/protocol.c
net/mptcp/protocol.h
net/netfilter/nf_conntrack_core.c
net/netlink/af_netlink.c
net/wireless/nl80211.c
security/selinux/hooks.c
tools/net/ynl/lib/ynl.c
tools/testing/selftests/net/mptcp/diag.sh
tools/testing/selftests/net/mptcp/mptcp_join.sh
tools/testing/selftests/net/mptcp/mptcp_lib.sh