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
Date: Mon, 17 Jun 2013 09:35:25 +0100 [thread overview]
Message-ID: <20130617083524.GA28225@linaro.org> (raw)
In-Reply-To: <20130617173627.8bd67da7e93639cf85afcedb@canb.auug.org.au>
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
next prev parent reply other threads:[~2013-06-17 8:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 7:36 linux-next: manual merge of the arm64-hugepages tree with the arm64 tree Stephen Rothwell
2013-06-17 8:35 ` Steve Capper [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-06-17 7:45 Stephen Rothwell
2013-06-17 8:42 ` Steve Capper
2013-06-17 9:01 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130617083524.GA28225@linaro.org \
--to=steve.capper@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=stefano.stabellini@eu.citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).