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,
Marc Zyngier <marc.zyngier@arm•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:42:25 +0100 [thread overview]
Message-ID: <20130617084224.GB28225@linaro.org> (raw)
In-Reply-To: <20130617174528.fc0381c10f8c5296b4efe776@canb.auug.org.au>
On Mon, Jun 17, 2013 at 05:45:28PM +1000, Stephen Rothwell wrote:
> Hi Steve,
Hi Stephen,
>
> Today's linux-next merge of the arm64-hugepages tree got conflicts in
> arch/arm64/include/asm/pgtable-hwdef.h and
> arch/arm64/include/asm/pgtable.h between commit 363116073a26 ("arm64:
> KVM: define HYP and Stage-2 translation page flags") from the arm64 tree
> and commits 072b1b62a643 ("ARM64: mm: Make PAGE_NONE pages read only and
> no-execute") and af07484863e0 ("ARM64: mm: THP support") from the
> arm64-hugepages tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Thanks, the fixup looks good to me.
> Note that the arm64 tree version of PMD_SECT_USER used a pteval_t where I
> would have expected a pmdval_t like the arm64-hugepages tree version.
Yes I think it should be a pmdval_t too, I will follow this up.
Cheers,
--
Steve
next prev parent reply other threads:[~2013-06-17 8:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 7:45 linux-next: manual merge of the arm64-hugepages tree with the arm64 tree Stephen Rothwell
2013-06-17 8:42 ` Steve Capper [this message]
2013-06-17 9:01 ` Marc Zyngier
-- strict thread matches above, loose matches on Subject: below --
2013-06-17 7:36 Stephen Rothwell
2013-06-17 8:35 ` Steve Capper
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=20130617084224.GB28225@linaro.org \
--to=steve.capper@linaro$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.zyngier@arm$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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