archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the ppc-temp tree with the metag tree
@ 2013-04-18  7:49 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-04-18  7:49 UTC (permalink / raw)
  To: Michael Ellerman
  Cc: linux-next, linux-kernel, ppc-dev, Benjamin Herrenschmidt,
	Paul Bolle, James Hogan

[-- Attachment #1: Type: text/plain, Size: 892 bytes --]

Hi Michael,

Today's linux-next merge of the ppc-temp tree got a conflict in
arch/metag/mm/Kconfig between commit 2b8660ed3bfe ("memblock: Kill
ARCH_POPULATES_NODE_MAP once more") from the metag tree and commit
45b02f8d94e3 ("memblock: kill "config MAX_ACTIVE_REGIONS"") from the
ppc-temp tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell          

diff --cc arch/metag/mm/Kconfig
index 794f26a,ccf2576..0000000
--- a/arch/metag/mm/Kconfig
+++ b/arch/metag/mm/Kconfig
@@@ -93,11 -93,9 +93,6 @@@ config ARCH_SPARSEMEM_ENABL
  	def_bool y
- 	int
- 	default "2" if SPARSEMEM
- 	default "1"
 -	def_bool y
  	def_bool y

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-04-18  7:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-18  7:49 linux-next: manual merge of the ppc-temp tree with the metag tree Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).