Re: [GIT PULL] locking changes for v5.5

[Ingo Molnar <mingo@kernel.org>]

* Ingo Molnar <mingo@kernel.org> wrote:

> Linus,
> 
> Please pull the latest locking-core-for-linus git tree from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-core-for-linus
> 
>    # HEAD: 500543c53a54134ced386aed85cd93cf1363f981 lkdtm: Remove references to CONFIG_REFCOUNT_FULL

>  net/core/sock.c                               |   2 +-

Merge conflict note, the following commit from the locking tree:

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

Conflicts with the following new commit in the networking tree, also 
upstream now:

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

This is just a context conflict, the two one-liner changes can be applied 
independently, resulting in:

  5facae4f3549:                 mutex_release(&sk->sk_lock.dep_map, _RET_IP_);
  8265792bf887:        } else if (sk_add_backlog(sk, skb, READ_ONCE(sk->sk_rcvbuf))) {

This resolution is in tip:master as well.

Thanks,

	Ingo