From: Russell King <rmk@armlinux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Gregory CLEMENT <gregory.clement@free-electrons.com>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>
Subject: Re: linux-next: manual merge of the akpm tree with the arm tree
Date: Fri, 15 Jul 2016 09:33:51 +0100 [thread overview]
Message-ID: <20160715083351.GD14726@flint.armlinux.org.uk> (raw)
In-Reply-To: <20160715182947.2ce9825a@canb.auug.org.au>
On Fri, Jul 15, 2016 at 06:29:47PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/arm/mm/dma-mapping.c
>
> between commits:
>
> f12708965069 ("ARM: 8561/3: dma-mapping: Don't use outer_flush_range when the L2C is coherent")
> 565068221b90 ("ARM: 8561/4: dma-mapping: Fix the coherent case when iommu is used")
>
> from the arm tree and patch:
>
> "ARM: dma-mapping: use unsigned long for dma_attrs"
>
> from the akpm-current tree.
Thanks Stephen, resolution looks good to me.
--
Russell King
ARM architecture Linux Kernel maintainer
next prev parent reply other threads:[~2016-07-15 8:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 8:29 linux-next: manual merge of the akpm tree with the arm tree Stephen Rothwell
2016-07-15 8:33 ` Russell King [this message]
2016-07-15 8:56 ` Krzysztof Kozlowski
-- strict thread matches above, loose matches on Subject: below --
2011-11-22 6:17 Stephen Rothwell
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=20160715083351.GD14726@flint.armlinux.org.uk \
--to=rmk@armlinux.org.uk \
--cc=akpm@linux-foundation.org \
--cc=gregory.clement@free-electrons.com \
--cc=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.