From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 8 Oct 2020 22:44:50 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9d49aea13f1e35869158abe7e314e16dc8f50ff1;p=linux.git

Merge git://git./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>
---

9d49aea13f1e35869158abe7e314e16dc8f50ff1
diff --cc net/rxrpc/conn_event.c
index 0628dad2bdeac,64ace2960ecc2..6b7c6f4a82e36
--- a/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: