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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1301 bytes --]

Hi all,

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

  net/core/sock.c

between commit:

  8265792bf887 ("net: silence KCSAN warnings around sk_add_backlog() calls")

from the net tree and commit:

  5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()")

from the tip 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/core/sock.c
index 54c06559ad8f,50b930364cb0..000000000000
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@@ -521,8 -521,8 +521,8 @@@ int __sk_receive_skb(struct sock *sk, s
  
  		rc = sk_backlog_rcv(sk, skb);
  
- 		mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
+ 		mutex_release(&sk->sk_lock.dep_map, _RET_IP_);
 -	} else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
 +	} else if (sk_add_backlog(sk, skb, READ_ONCE(sk->sk_rcvbuf))) {
  		bh_unlock_sock(sk);
  		atomic_inc(&sk->sk_drops);
  		goto discard_and_relse;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]