linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Paul McKenney <paulmck@linux.vnet.ibm.com>
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 14:08:55 -0700	[thread overview]
Message-ID: <CA+55aFy-+xihviT90znaMwwX3rbZ5Pt_uUdjeuVNKmbEevGKfw@mail.gmail.com> (raw)
In-Reply-To: <20170510205109.GX3956@linux.vnet.ibm.com>

On Wed, May 10, 2017 at 1:51 PM, Paul E. McKenney
<paulmck@linux.vnet.ibm.com> wrote:
> On Wed, May 10, 2017 at 01:17:54PM -0700, Linus Torvalds wrote:
>>
>> 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?

Basically, just forward the information along with the description of
what's in the branch, so that I know to expect it.

In this case it didn't actually *matter*, since I noticed it on my
own, but particularly if I'm on the road I don't generally have the
compute power with me to do a full allmodconfig build between each
pull (I usually do one or two a day), so I can miss these things more
easily. And if it happens on other architectures, I wouldn't notice.

It doesn't have to be exhaustive. Just a note saying  that "there's
going to be a semantic merge conflict in file xyz due to abc" means
that I can then specifically take it into account. Even if I were to
be on the road, I can then check that particular driver out and make
sure to check that it builds, etc.

[ Sometimes I also take those kinds of conflict notes into account for
pull scheduling. For example, back when the kids were small, and I
ended up having to occasionally drive them around, I used to aim to do
the simple quick pulls first,  delaying things that might need more
care until I didn't have some driving schedule over my head. That
happens less these days when the kids are off to college and the sole
remaining one mostly drives herself around. ]

                     Linus

  reply	other threads:[~2017-05-10 21:08 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
2017-05-10 21:08           ` Linus Torvalds [this message]
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=CA+55aFy-+xihviT90znaMwwX3rbZ5Pt_uUdjeuVNKmbEevGKfw@mail.gmail.com \
    --to=torvalds@linux-foundation.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=tglx@linutronix.de \
    /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).