Skip to contentSkip to conversation

Please add the tiny tree to linux-next

DISCUSSION Josh Triplett 2 participants 4 messages Sep 22, 2014

lore
Share & tools
lore
#0 lore raw

Hi Stephen,

Can you please add the tiny tree, branch tiny/next of
https://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git , to linux-next?

I'll be using this tree to upstream various patches for Linux kernel tinification. I plan to use topic branches under tiny/* for separate topics, typically based on the previous -rc1, merging them into tiny/next; when the merge window opens, I'll submit a pull request for tiny/next and start merging new tiny/* topic branches into a tiny/next-next branch or similar that will become the new tiny/next after tiny/next gets merged.

- Josh Triplett

#1 lore raw

Hi Josh,

Quoted 5 lines · On Mon, 22 Sep 2014 10:53:04 -0700 Josh Triplett <[email protected]> wrote:

Can you please add the tiny tree, branch tiny/next of
https://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git , to linux-next?

Quoted 7 lines

I'll be using this tree to upstream various patches for Linux kernel tinification. I plan to use topic branches under tiny/* for separate topics, typically based on the previous -rc1, merging them into tiny/next; when the merge window opens, I'll submit a pull request for tiny/next and start merging new tiny/* topic branches into a tiny/next-next branch or similar that will become the new tiny/next after tiny/next gets merged.

Added from today. I used git:// instead of https:// for the URL.

I do not want code for release N in linux-next until after (N-1)-rc1 has been released.

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.

Signature · 3 lines
Cheers,
Stephen Rothwell 
[email protected]
#2 lore raw
Quoted 16 lines · Stephen Rothwell

Hi Josh,

Quoted 5 lines · On Mon, 22 Sep 2014 10:53:04 -0700 Josh Triplett <[email protected]> wrote:

Can you please add the tiny tree, branch tiny/next of
https://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git , to linux-next?

Quoted 7 lines

I'll be using this tree to upstream various patches for Linux kernel tinification. I plan to use topic branches under tiny/* for separate topics, typically based on the previous -rc1, merging them into tiny/next; when the merge window opens, I'll submit a pull request for tiny/next and start merging new tiny/* topic branches into a tiny/next-next branch or similar that will become the new tiny/next after tiny/next gets merged.

Quoted 4 lines

Added from today. I used git:// instead of https:// for the URL.

I do not want code for release N in linux-next until after (N-1)-rc1 has been released.

So, rather than moving tiny/next-next to tiny/next as soon as tiny/next gets merged during the merge window, wait until the end of the merge window (and the release of -rc1) to do so? That makes sense, to avoid causing confusion and unnecessary conflicts during the merge window.

The code in tiny/next right now is based on 3.17-rc1, and is intended for 3.18. I'll send a pull request for 3.18 as soon as the 3.18 merge window opens, and any patches I receive after that point will go into tiny/next-next. I'll wait to move tiny/next-next to tiny/next until 3.18-rc1 is released.

- Josh Triplett

#3 lore raw

Hi Josh,

Quoted 10 lines · On Mon, 22 Sep 2014 15:51:56 -0700 [email protected] wrote:
Quoted 3 lines · Stephen Rothwell

I do not want code for release N in linux-next until after (N-1)-rc1 has been released.

So, rather than moving tiny/next-next to tiny/next as soon as tiny/next gets merged during the merge window, wait until the end of the merge window (and the release of -rc1) to do so? That makes sense, to avoid causing confusion and unnecessary conflicts during the merge window.

Yes, that is exactly my motivation.

Quoted 5 lines

The code in tiny/next right now is based on 3.17-rc1, and is intended for 3.18. I'll send a pull request for 3.18 as soon as the 3.18 merge window opens, and any patches I receive after that point will go into tiny/next-next. I'll wait to move tiny/next-next to tiny/next until 3.18-rc1 is released.

Of course, bug fixes should be merged as soon as sensible/possible in any case. Some people run a second branch for bug fixes which they merge into their -next branch (if the fixes warrant it) after Linus' merges it. But that may be overkill.

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]