Skip to content
Commit 65f5dd4f 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.

Conflicts:

net/mptcp/protocol.c
  adf1bb78 ("mptcp: fix snd_wnd initialization for passive socket")
  9426ce47 ("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
  0d60d8df ("dpll: rely on rcu for netdev_dpll_pin()")
  e7f8df0e ("dpll: move xa_erase() call in to match dpll_pin_alloc() error path order")

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

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

net/wireless/nl80211.c
  f78c1375 ("wifi: nl80211: reject iftype change with mesh ID change")
  414532d8

 ("wifi: cfg80211: use IEEE80211_MAX_MESH_ID_LEN appropriately")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 489645d3 87adedeb
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment