Re: linux-next: manual merge of the arm64-hugepages tree with thearm64 tree

[Steve Capper]

On Mon, Jun 17, 2013 at 05:36:27PM +1000, Stephen Rothwell wrote:
> Hi Steve,

Hi Stephen,

> 
> Today's linux-next merge of the arm64-hugepages tree got a conflict in
> arch/arm64/Kconfig between commit aa42aa1389a5 ("arm64/xen: introduce
> CONFIG_XEN and hypercall.S on ARM64") from the arm64 tree and commit
> d03bb1455f3a ("ARM64: mm: Raise MAX_ORDER for 64KB pages and THP") from
> the arm64-hugepages tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks this fixup looks good to me.

Cheers,
-- 
Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/