[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1347463120.10751.63.camel@gandalf.local.home>
Date: Wed, 12 Sep 2012 11:18:40 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: paulmck@...ux.vnet.ibm.com
Cc: Josh Triplett <josh@...htriplett.org>,
linux-kernel@...r.kernel.org, mingo@...e.hu, laijs@...fujitsu.com,
dipankar@...ibm.com, akpm@...ux-foundation.org,
mathieu.desnoyers@...ymtl.ca, niv@...ibm.com, tglx@...utronix.de,
peterz@...radead.org, Valdis.Kletnieks@...edu, dhowells@...hat.com,
eric.dumazet@...il.com, darren@...art.com, fweisbec@...il.com,
sbw@....edu, patches@...aro.org,
"Paul E. McKenney" <paul.mckenney@...aro.org>,
Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: [PATCH tip/core/rcu 04/15] rcu: Permit RCU_NONIDLE() to be used
from interrupt context
[ Added Linus to verify what I'm talking about ]
On Wed, 2012-09-12 at 08:03 -0700, Paul E. McKenney wrote:
> Doesn't Fengguang pull branches individually? And won't that mean
> that as soon as I push my export-removal commit, that he will see
> build failures?
>
> Or are you suggesting that we both send both commits?
No, what I could do is to push the branch out to my repository on
kernel.org (I'm currently running it under my test suite), and then both
you and Ingo can pull from it.
It is based off of v3.6-rc5 and only has Josh's change in it. This way,
when Ingo pulls it into the perf/core branch, I can work against that,
and you could either pull the same branch directly from me (as you need
it to work too), or you could have Ingo pull it into the rcu branches in
tip, and you could work against that.
The trick is that the branch I push is against Linus's tree (something
that we all should be working against) and contains only the one change.
Then everyone that needs this change can just pull it directly, and git
will sort it all out without any conflicts. This is the method that
Linus was talking about at Kernel Summit.
-- Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists