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

Small conflict around locking in rxrpc_process_event() -
channel_lock moved to bundle in next, while state lock
needs _bh() from net.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/ocelot/felix_vsc9959.c
Simple merge

diff --cc drivers/net/dsa/ocelot/seville_vsc9953.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot_vsc7514.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

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

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

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

diff --cc net/core/filter.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

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

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

diff --cc net/openvswitch/conntrack.c
Simple merge

diff --cc net/rxrpc/ar-internal.h
Simple merge

diff --cc net/rxrpc/call_object.c
Simple merge

diff --cc net/rxrpc/conn_event.c
index 0628dad,64ace29..6b7c6f4
--- 1/net/rxrpc/conn_event.c
--- 2/net/rxrpc/conn_event.c
+++ b/net/rxrpc/conn_event.c
@@@ -341,8 -339,8 +341,8 @@@ static int rxrpc_process_event(struct r
                if (ret < 0)
                        return ret;
  
 -              spin_lock(&conn->channel_lock);
 +              spin_lock(&conn->bundle->channel_lock);
-               spin_lock(&conn->state_lock);
+               spin_lock_bh(&conn->state_lock);
  
                if (conn->state == RXRPC_CONN_SERVICE_CHALLENGING) {
                        conn->state = RXRPC_CONN_SERVICE;
@@@ -351,12 -349,12 +351,12 @@@
                                rxrpc_call_is_secure(
                                        rcu_dereference_protected(
                                                conn->channels[loop].call,
 -                                              lockdep_is_held(&conn->channel_lock)));
 +                                              lockdep_is_held(&conn->bundle->channel_lock)));
                } else {
-                       spin_unlock(&conn->state_lock);
+                       spin_unlock_bh(&conn->state_lock);
                }
  
 -              spin_unlock(&conn->channel_lock);
 +              spin_unlock(&conn->bundle->channel_lock);
                return 0;
  
        default:

diff --cc net/sctp/auth.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge