Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1444060 > unrolled thread
| Started by | Russell King <rmk@armlinux.org.uk> |
|---|---|
| First post | 2016-07-15 10:40 +0200 |
| Last post | 2016-07-15 10:40 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
Re: linux-next: manual merge of the akpm tree with the arm tree Russell King <rmk@armlinux.org.uk> - 2016-07-15 10:40 +0200
| From | Russell King <rmk@armlinux.org.uk> |
|---|---|
| Date | 2016-07-15 10:40 +0200 |
| Subject | Re: linux-next: manual merge of the akpm tree with the arm tree |
| Message-ID | <rV6P8-4CX-31@gated-at.bofh.it> |
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
Back to top | Article view | linux.kernel
csiph-web