public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: inclusion request for temporary memblock testing branch
@ 2011-12-05 21:04 Tejun Heo
  2011-12-05 21:59 ` Stephen Rothwell
  0 siblings, 1 reply; 2+ messages in thread
From: Tejun Heo @ 2011-12-05 21:04 UTC (permalink / raw)
  To: sfr
  Cc: mingo, yinghai, hpa, tony.luck, ralf, schwidefsky, liqin.chen,
	lethal, davem, linux-kernel, linux-arch, mingo, jonas, lennox.wu,
	benh

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.

-- 
tejun

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-12-05 21:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-05 21:04 linux-next: inclusion request for temporary memblock testing branch Tejun Heo
2011-12-05 21:59 ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox