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

Adjacent changes:

net/mptcp/protocol.h
  63740448a32e ("mptcp: fix accept vs worker race")
  2a6a870e44dd ("mptcp: stops worker on unaccepted sockets at listener close")
  ddb1a072f858 ("mptcp: move first subflow allocation at mpc access time")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/dsa/microchip/ksz8795.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/dev.c
Simple merge

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/bridge/br_netfilter_hooks.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/protocol.h
index d91b852,d6469b6..2d7b2c8
--- 1/net/mptcp/protocol.h
--- 2/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@@ -626,10 -629,12 +626,12 @@@ void mptcp_close_ssk(struct sock *sk, s
                     struct mptcp_subflow_context *subflow);
  void __mptcp_subflow_send_ack(struct sock *ssk);
  void mptcp_subflow_reset(struct sock *ssk);
+ void mptcp_subflow_queue_clean(struct sock *sk, struct sock *ssk);
  void mptcp_sock_graft(struct sock *sk, struct socket *parent);
 -struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk);
 +struct socket *__mptcp_nmpc_socket(struct mptcp_sock *msk);
  bool __mptcp_close(struct sock *sk, long timeout);
  void mptcp_cancel_work(struct sock *sk);
+ void __mptcp_unaccepted_force_close(struct sock *sk);
  void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk);
  
  bool mptcp_addresses_equal(const struct mptcp_addr_info *a,

diff --cc net/mptcp/subflow.c
Simple merge