linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/rxrpc/conn_event.c

between commit:

  fa1d113a0f96 ("rxrpc: Fix some missing _bh annotations on locking conn->state_lock")

from the net tree and commit:

  245500d853e9 ("rxrpc: Rewrite the client connection manager")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/rxrpc/conn_event.c
index 64ace2960ecc,0628dad2bdea..000000000000
--- a/net/rxrpc/conn_event.c
+++ b/net/rxrpc/conn_event.c
@@@ -339,8 -341,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;
@@@ -349,12 -351,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:

Attachment: pgp2Qle3AV3_0.pgp
Description: OpenPGP digital signature