From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Will Deacon <Will.Deacon@arm.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the arm-lpae tree with the arm tree
Date: Fri, 9 Dec 2011 10:36:52 +0000 [thread overview]
Message-ID: <20111209103652.GA23753@arm.com> (raw)
In-Reply-To: <20111208110059.1d88730db9358e079949b89c@canb.auug.org.au>
Hi Stephen,
On Thu, Dec 08, 2011 at 12:00:59AM +0000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-lpae tree got a conflict in
> arch/arm/mm/idmap.c between commits 8903826d0cd9 ("ARM: idmap: populate
> identity map pgd at init time using .init.text") and 4e8ee7de227e ("ARM:
> SMP: use idmap_pgd for mapping MMU enable during secondary booting") from
> the arm tree and commit 1932aa1edc86 ("ARM: LPAE: Add identity mapping
> support for the 3-level page table format") from the arm-lpae tree.
>
> I tried to fix it up (see below) and can carry the fix as necessary.
The fix looks correct but Russell merged the LPAE patches into his tree
last night and sorted out the conflicts, so you can now drop my for-next
branch from -next (I'll still keep the kmemleak one).
Thanks.
--
Catalin
next prev parent reply other threads:[~2011-12-09 10:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-08 0:00 linux-next: manual merge of the arm-lpae tree with the arm tree Stephen Rothwell
2011-12-09 10:36 ` Catalin Marinas [this message]
2011-12-09 11:11 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-11-22 1:03 Stephen Rothwell
2011-11-22 8:13 ` Russell King
2011-11-22 9:58 ` Catalin Marinas
2011-11-22 9:47 ` Catalin Marinas
2011-11-22 11:05 ` Catalin Marinas
2011-09-12 1:15 Stephen Rothwell
2011-07-07 1:14 Stephen Rothwell
2011-06-17 0:26 Stephen Rothwell
2011-06-17 10:17 ` Catalin Marinas
2011-06-10 0:52 Stephen Rothwell
2011-06-10 14:43 ` Catalin Marinas
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=20111209103652.GA23753@arm.com \
--to=catalin.marinas@arm.com \
--cc=Will.Deacon@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/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).