From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [RFC GIT PULL, v2] RCU changes for v4.12
Date: Wed, 10 May 2017 13:51:09 -0700 [thread overview]
Message-ID: <20170510205109.GX3956@linux.vnet.ibm.com> (raw)
In-Reply-To: <CA+55aFzHz3qGqKmdqih0AwGx0ggxe4gr2VbHbSfC-9W2yFn1cQ@mail.gmail.com>
On Wed, May 10, 2017 at 01:17:54PM -0700, Linus Torvalds wrote:
> On Wed, May 10, 2017 at 12:54 PM, Paul E. McKenney
> <paulmck@linux.vnet.ibm.com> wrote:
> >
> > I am testing a merge with current linus/master, and I looked through
> > the commits in -next selected by:
> >
> > gitk v4.11.. --no-merges --all-match --grep=drm --grep=selftest
> >
> > I didn't find anything obvious. If the tests complete successfully,
> > I will try running the DRM selftest.
>
> The drivers/gpu/drm/i915/selftests/mock_gem_device.c had a new use of
> SLAB_DESTROY_BY_RCU, which obviously conflicted with the rename to
> SLAB_TYPESAFE_BY_RCU.
>
> It doesn't show up as a merge-time code conflict, only as a build-time
> failure. It's why I do allmodconfig builds after every pull. That
> doesn't catch everything (I only do it for x86-64, for example), but
> it catches a lot.
>
> And no, it's not a problem. These things happen, and it's literally my
> job to make sure my merges work out.
>
> I don't actually expect submaintainers to figure things like that out,
> although this *did* show up in linux-next, and it's a bit
> disappointing how that information got lost somewhere on the way.
>
> It kind of implies that the prep work that linux-next does doesn't get
> fully used.
I did see that from linux-next. For future reference, what should I
have done with it? Added it to my pull request or to the commit log of
my merge commit?
> Normally I wouldn't even have mentioned it, if it wasn't for the fact
> that I got a 300kB data dump in my mailbox, and that huge amount of
> data wasn't actually even very relevant.
Well, my testing did find a lockdep splat, so the effort was
not wasted. ;-)
Thanx, Paul
next prev parent reply other threads:[~2017-05-10 20:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-01 9:59 [GIT PULL] RCU changes for v4.12 Ingo Molnar
2017-05-02 1:19 ` Linus Torvalds
2017-05-02 4:02 ` Paul E. McKenney
2017-05-02 4:11 ` Linus Torvalds
2017-05-02 4:30 ` Paul E. McKenney
2017-05-02 7:59 ` Ingo Molnar
2017-05-02 8:31 ` [PATCH] srcu: Debloat the <linux/rcu_segcblist.h> header Ingo Molnar
2017-05-02 10:25 ` Paul E. McKenney
2017-05-02 12:56 ` Paul E. McKenney
2017-05-09 7:26 ` [RFC GIT PULL, v2] RCU changes for v4.12 Ingo Molnar
2017-05-10 17:27 ` Linus Torvalds
2017-05-10 19:54 ` Ingo Molnar
2017-05-10 20:01 ` Linus Torvalds
2017-05-11 6:54 ` Ingo Molnar
2017-05-10 19:54 ` Paul E. McKenney
2017-05-10 20:17 ` Linus Torvalds
2017-05-10 20:51 ` Paul E. McKenney [this message]
2017-05-10 21:08 ` Linus Torvalds
2017-05-10 22:53 ` Paul E. McKenney
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=20170510205109.GX3956@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=a.p.zijlstra@chello.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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