Skip to contentSkip to conversation

Request for inclusion of ep93xx tree in linux-next

DISCUSSION Ryan Mallon 3 participants 7 messages Apr 30, 2012 – Jun 4, 2012 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi Stephen,

Can you please add the following branches:

ep93xx-cleanup
ep93xx-fixes

from the ep93xx git tree:

git://github.com/RyanMallon/linux-ep93xx.git

To linux-next. Both branches are stable and based on v3.4-rc2. Testing for the tree is covered by the arm ep93xx_defconfig.

Thanks,
~Ryan

#1 lore raw

Hi Ryan,

Quoted 6 lines · On Tue, 01 May 2012 08:48:09 +1000 Ryan Mallon <[email protected]> wrote:

Can you please add the following branches:

ep93xx-cleanup
ep93xx-fixes

Quoted 6 lines

from the ep93xx git tree:

git://github.com/RyanMallon/linux-ep93xx.git

To linux-next. Both branches are stable and based on v3.4-rc2. Testing for the tree is covered by the arm ep93xx_defconfig.

I have added these from today as ep93xx-current (fixes for Linus' current tree - branch ep93xx-fixes) and ep93xx (stuff for the next merge window - branch ep93xx-cleanup). I have listed just you as the contact in case I have problems (conflicts, build failures, unable to fetch etc).

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 · 22 lines
Cheers,
Stephen Rothwell 
sfr at canb.auug.org.au

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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120501/09378d73/attachment.sig>
#2 lore raw
In reply to Ryan Mallon
Quoted 7 lines · Ryan Mallon

Hi Stephen,

Can you please add the following branches:

ep93xx-cleanup
ep93xx-fixes

Quoted 7 lines

from the ep93xx git tree:

git://github.com/RyanMallon/linux-ep93xx.git

To linux-next. Both branches are stable and based on v3.4-rc2. Testing for the tree is covered by the arm ep93xx_defconfig.

Hi Ryan,

just for your convenience, it helps if you have only one branch that you get included into linux-next and that combines various branches which you intend to send to arm-soc. That frees you from the need to notify Stephen every time you want to have another branch included.

Arnd

#3 lore raw
Quoted 16 lines · Arnd Bergmann
Quoted 7 lines · Ryan Mallon

Hi Stephen,

Can you please add the following branches:

ep93xx-cleanup
ep93xx-fixes

Quoted 7 lines

from the ep93xx git tree:

git://github.com/RyanMallon/linux-ep93xx.git

To linux-next. Both branches are stable and based on v3.4-rc2. Testing for the tree is covered by the arm ep93xx_defconfig.

Quoted 6 lines

Hi Ryan,

just for your convenience, it helps if you have only one branch that you get included into linux-next and that combines various branches which you intend to send to arm-soc. That frees you from the need to notify Stephen every time you want to have another branch included.

Thanks for the tip. I leave the branches as is for the moment. If I end up adding any additional branches to my tree, then I will look at creating an ep93xx-for-next branch then. In this case, should the for-next branch just be a regular merge of all the other branches I have? How do I make it verifiable that everything from the other branches has been being tested in the for-next branch?

Thanks,
~Ryan

#4 lore raw
Quoted 5 lines · Ryan Mallon

Thanks for the tip. I leave the branches as is for the moment. If I end up adding any additional branches to my tree, then I will look at creating an ep93xx-for-next branch then. In this case, should the for-next branch just be a regular merge of all the other branches I have?

Yes. In the arm-soc tree I usually just merge all changes on top of the for-next branch, and occasionally clean it up, starting over with a fresh -rc release and pulling the other branches in, then use git-diff to make sure the contents are identical to what they were before.

Quoted 2 lines

How do I make it verifiable that everything from the other branches has been being tested in the for-next branch?

I'm not sure I understand the question. Maybe you are looking for 'git branch --no-merged for-next' That command will show all local branches that are not merged into the for-next branch.

Arnd

#5 lore raw
In reply to Ryan Mallon

Hi Stephen,

I have ended up adding another branch to my ep93xx tree, so I have created an ep93xx-for-next branch, which I will just merge all of branches into. Can you please drop the ep93xx-cleanup and ep93xx-fixes branches and just include ep93xx-for-next instead.

Thanks,
~Ryan

Quoted 16 lines · Ryan Mallon

Hi Stephen,

Can you please add the following branches:

ep93xx-cleanup
ep93xx-fixes

from the ep93xx git tree:

git://github.com/RyanMallon/linux-ep93xx.git

To linux-next. Both branches are stable and based on v3.4-rc2. Testing for the tree is covered by the arm ep93xx_defconfig.

Thanks,
~Ryan

#6 lore raw

Hi Ryan,

Quoted 5 lines · On Mon, 04 Jun 2012 15:52:13 +1000 Ryan Mallon <[email protected]> wrote:

I have ended up adding another branch to my ep93xx tree, so I have created an ep93xx-for-next branch, which I will just merge all of branches into. Can you please drop the ep93xx-cleanup and ep93xx-fixes branches and just include ep93xx-for-next instead.

Done.

Signature · 9 lines
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120604/627378e3/attachment.sig>