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>,
Nicolas Pitre <nicolas.pitre@linaro.org>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the arm-lpae tree with the arm tree
Date: Tue, 22 Nov 2011 09:47:38 +0000 [thread overview]
Message-ID: <20111122094738.GB31064@arm.com> (raw)
In-Reply-To: <20111122120358.aa2cefdcdace9a98acafd4b9@canb.auug.org.au>
Hi Stephen,
On Tue, Nov 22, 2011 at 01:03:58AM +0000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-lpae tree got a conflict in
> arch/arm/mm/ioremap.c between commit 3afb51f744b6 ("ARM: add generic
> ioremap optimization by reusing static mappings") from the arm tree and
> commit ec93d80c4b07 ("ARM: LPAE: Page table maintenance for the 3-level
> format") from the arm-lpae tree.
>
> I guessed (probably incorrectly) about the fix up (see below). Please
> supply a better fix if necessary.
Thanks for pointing out. I'll have a look at the conflict and let you
know.
> More generally, is the LPAE stuff going to be merged soon?
Hopefully I get it merged during the upcoming merging window (for
3.3-rc1) but it does not depend only on me.
> The above
> arm-lpae commit dates from February (though it was recommitted on Nov
> 15) ...
Maybe I should do a 'git rebase --ignore-date', it doesn't make much
sense for a reworked patch to still keep the original author date.
--
Catalin
next prev parent reply other threads:[~2011-11-22 9:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-22 1:03 linux-next: manual merge of the arm-lpae tree with the arm tree Stephen Rothwell
2011-11-22 8:13 ` Russell King
2011-11-22 9:58 ` Catalin Marinas
2011-11-22 9:47 ` Catalin Marinas [this message]
2011-11-22 11:05 ` Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2011-12-08 0:00 Stephen Rothwell
2011-12-09 10:36 ` Catalin Marinas
2011-12-09 11:11 ` Stephen Rothwell
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=20111122094738.GB31064@arm.com \
--to=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.pitre@linaro.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).