Skip to contentSkip to conversation

linux-next: inclusion request for temporary memblock testing branch

DISCUSSION Tejun Heo 2 participants 2 messages Dec 5, 2011 Generic include/asm header files

lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

Hello, Stephen.

Can you please include the following branch into linux-next?

git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git memblock-kill-early_node_map

This eventually will go through tip/ but Ingo wants it to be tested a bit before proceeding.

http://thread.gmane.org/gmane.linux.kernel.cross-arch/11566/focus=1224459

Pulling it into linux-next creates conflicts in three files - arch/arm/mm/init.c, arch/mips/Kconfig, arch/score/Kconfig. All conflicts are trivial. Both parties try to add something and combination of the two work fine. The following branch contains merged branch for reference.

git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git memblock-kill-early_node_map-next

allno/modconfig on x86 compile tested. My randomish test kernel seems to work fine too. I tested building on different archs on good part of the archs on first posting but my cross build setup is sorta screwed now and couldn't get much done this time but there hasn't been any substantial change since the first posting. I'm planning on getting the cross build env back up soonish once moving is complete.

Thank you.

Signature · 1 line
tejun
#1 lore raw

Hi Tejun,

Quoted 4 lines · On Mon, 5 Dec 2011 13:04:05 -0800 Tejun Heo <[email protected]> wrote:

Can you please include the following branch into linux-next?

git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git memblock-kill-early_node_map

OK, I have added that from today.

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 · 15 lines
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.