Multiple for-next branches from same tree

Hi Stephen,

With ARC arch merged in 3.9-rc1 I feel the need for a revised workflow.

I intend to have 2 branches for -next exposure: for-curr and for-next.
* for-curr would contain the bug fixes for this release to be sent to Linus at some point in time.
* for-next obviously is next release stuff and will be rebased off for-curr.

The other strategy, personally less preferred, is to keep only for-next and tag it at right cut off point when sending pull request to Linus. Do you see any semantical differences in the two approaches.

One (hypothetical) scenario that comes to my mind is that if for-curr introduces a conflict, which for-next fixes up somehow, that would still be caught in both the cases.

Comments !

Thx,
-Vineet

Hi Vineet,

I have several sets of branches like that and it works fine.

Occasionally, the branches will conflict, but that can be sorted by merging the for-curr branch into the for-next branch after Linus has merged the for-curr branch.

Cheers,
Stephen Rothwell                    [email protected]

Thanks for your reply Stephen. In that case, can you add the following additional arc branch to -next

git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git for-curr

-Vineet

Hi Vineet,

Done.

Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgment of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window.

You will need to ensure that the patches/commits in your tree/series have been:
* submitted under GPL v2 (or later) and include the Contributor's Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary.

Cheers,
Stephen Rothwell 
[email protected]

Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees.  You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next.  These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc.  The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc.  If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.