Date: Mon, 17 Jun 2013 09:35:25 +0100
From: Steve Capper <steve.capper@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
        Catalin Marinas <catalin.marinas@arm.com>
Subject: Re: linux-next: manual merge of the arm64-hugepages tree with the
 arm64 tree
Message-ID: <20130617083524.GA28225@linaro.org>
References: <20130617173627.8bd67da7e93639cf85afcedb@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130617173627.8bd67da7e93639cf85afcedb@canb.auug.org.au>
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 807
Lines: 25

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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/