On Wed, Sep 12, 2012 at 10:13:30AM -0400, Steven Rostedt wrote:
> On Tue, 2012-09-11 at 18:07 -0700, Paul E. McKenney wrote:
> >
> > > Paul, you just push your changes through tip, right? Then we can just
> > > let Ingo know. I could even make the patch a separate branch, that Ingo
> > > can pull into the RCU branch too.
> >
> > Yep! But we also need to worry about -next and -fengguang.
> >
> > How about if you push your change into 3.7 and I push mine into 3.8?
>
> Bah, this is what Linus said not to do. Although he's more about not
> having this happen in a single merge window, but this isn't the "git
> way".
>
> There should be no problem in pushing the patch based off of Linus's
> tree and have it be pulled into two branches. This is what Linus said he
> wanted. The change will go in via one of the branches, whichever is
> pulled first. And as the change will have the same SHA1 in both
> branches, git will merge it nicely. This is what Linus said at kernel
> summit that he wants people to do.
>
> Note, this will also get into -next and -fengguang's tree as well,
> without issue.
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?
Thanx, Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
