From: Ingo Molnar <mingo@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Thomas Gleixner <tglx@linutronix.de>,
Will Deacon <will@kernel.org>,
"Paul E. McKenney" <paulmck@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL] locking changes for v5.5
Date: Tue, 26 Nov 2019 09:38:01 +0100 [thread overview]
Message-ID: <20191126083801.GB98591@gmail.com> (raw)
In-Reply-To: <20191125113542.GA109603@gmail.com>
* 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
next prev parent reply other threads:[~2019-11-26 8:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-25 11:35 [GIT PULL] locking changes for v5.5 Ingo Molnar
2019-11-26 8:38 ` Ingo Molnar [this message]
2019-11-27 1:30 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191126083801.GB98591@gmail.com \
--to=mingo@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).