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>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the arm-lpae tree with the arm tree
Date: Fri, 17 Jun 2011 11:17:17 +0100 [thread overview]
Message-ID: <20110617101717.GB9504@e102109-lin.cambridge.arm.com> (raw)
In-Reply-To: <20110617102637.7868bc00.sfr@canb.auug.org.au>
Hi Stephen,
On Fri, Jun 17, 2011 at 01:26:37AM +0100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-lpae tree got a conflict in
> arch/arm/mm/dma-mapping.c between commit 8f5d638883e0 ("ARM: DMA: steal
> memory for DMA coherent mappings") from the arm tree and commit
> 7b550c77c248 ("ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_*")
> from the arm-lpae tree.
>
> The former has removed all the references to the PGDIR_* macros from this
> file, so I used that.
The fix is correct. I also did a kernel build for Versatile Express and
there were no errors.
Thanks.
--
Catalin
next prev parent reply other threads:[~2011-06-17 10:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-17 0:26 linux-next: manual merge of the arm-lpae tree with the arm tree Stephen Rothwell
2011-06-17 10:17 ` Catalin Marinas [this message]
-- 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-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-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=20110617101717.GB9504@e102109-lin.cambridge.arm.com \
--to=catalin.marinas@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).