On Wed, Sep 16, 2020 at 04:22:03AM +, Song Bao Hua (Barry Song) wrote:
> > c999bd436fe9 ("mm/cma: make number of CMA areas dynamic, remove
> > CONFIG_CMA_AREAS")
> >
> > from the akpm-current tree.
>
> I guess this is because Mike's patch was written on top of dma-mapping's next
> branch.
ailing List
>
> Subject: linux-next: manual merge of the akpm-current tree with the
> dma-mapping tree
>
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/Kconfig
>
> between commit:
>
> b7176c261cdb ("dma-c
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/Kconfig
between commit:
b7176c261cdb ("dma-contiguous: provide the ability to reserve per-numa CMA")
from the dma-mapping tree and commit:
c999bd436fe9 ("mm/cma: make number of CMA areas dynamic, remove
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/include/asm/xen/page-coherent.h
between commits:
bef4d2037d2143a ("xen/arm: consolidate page-coherent.h")
60d8cd572f655aa ("arm64/xen: fix xen-swiotlb cache flushing")
from the dma-mapping tree and
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/Kconfig
between commit:
936376f88ff1 ("arm: select the dma-noncoherent symbols for all swiotlb
builds")
from the dma-mapping tree and commit:
83286f0dcb91 ("arm: use generic mmap top-down layout and
On Mon, Jun 17, 2019 at 06:14:39PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> kernel/dma/remap.c
>
> between commit:
>
> 4b4b077cbd0a ("dma-remap: Avoid de-referencing NULL atomic_pool")
>
> from the dma-mapping
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
kernel/dma/remap.c
between commit:
4b4b077cbd0a ("dma-remap: Avoid de-referencing NULL atomic_pool")
from the dma-mapping tree and commit:
14de8ba3fa2e ("lib/genalloc.c: rename addr_in_gen_pool to
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/genalloc.h
between commit:
3334e1dc5d71 ("lib/genalloc: add gen_pool_dma_zalloc() for zeroed DMA
allocations")
from the dma-mapping tree and commit:
1c6b703cba18 ("lib/genalloc: introduce chunk
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/hexagon/Kconfig
between commit:
e0a9317d9004 ("hexagon: use generic dma_noncoherent_ops")
from the dma-mapping tree and commit:
365c1f4922a4 ("hexagon: switch to NO_BOOTMEM")
from the akpm-current tree.
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/hexagon/Kconfig
between commit:
e0a9317d9004 ("hexagon: use generic dma_noncoherent_ops")
from the dma-mapping tree and commit:
365c1f4922a4 ("hexagon: switch to NO_BOOTMEM")
from the akpm-current tree.
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/sh/Kconfig
between commits:
86596f0a2833 ("scatterlist: move the NEED_SG_DMA_LENGTH config symbol to
lib/Kconfig")
f616ab59c294 ("dma-mapping: move the NEED_DMA_MAP_STATE config symbol to
lib/Kconfig")
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/sh/Kconfig
between commits:
86596f0a2833 ("scatterlist: move the NEED_SG_DMA_LENGTH config symbol to
lib/Kconfig")
f616ab59c294 ("dma-mapping: move the NEED_DMA_MAP_STATE config symbol to
lib/Kconfig")
On Tue, 28 Oct 2014 07:54:09 +0100 Marek Szyprowski
wrote:
> Hello,
>
> On 2014-10-28 07:29, Andrew Morton wrote:
> > On Tue, 28 Oct 2014 15:24:44 +1100 Stephen Rothwell
> > wrote:
> >
> >> Today's linux-next merge of the akpm-current tree got a conflict in
> >> mm/cma.c between commit
Hello,
On 2014-10-28 07:29, Andrew Morton wrote:
On Tue, 28 Oct 2014 15:24:44 +1100 Stephen Rothwell
wrote:
Today's linux-next merge of the akpm-current tree got a conflict in
mm/cma.c between commit 16195ddd4ebc ("mm: cma: Ensure that
reservations never cross the low/high mem boundary")
On Tue, 28 Oct 2014 15:24:44 +1100 Stephen Rothwell
wrote:
> Today's linux-next merge of the akpm-current tree got a conflict in
> mm/cma.c between commit 16195ddd4ebc ("mm: cma: Ensure that
> reservations never cross the low/high mem boundary") from the
> dma-mapping tree and commit
On Tue, 28 Oct 2014 15:24:44 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the akpm-current tree got a conflict in
mm/cma.c between commit 16195ddd4ebc (mm: cma: Ensure that
reservations never cross the low/high mem boundary) from the
dma-mapping tree and
Hello,
On 2014-10-28 07:29, Andrew Morton wrote:
On Tue, 28 Oct 2014 15:24:44 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the akpm-current tree got a conflict in
mm/cma.c between commit 16195ddd4ebc (mm: cma: Ensure that
reservations never cross the
On Tue, 28 Oct 2014 07:54:09 +0100 Marek Szyprowski m.szyprow...@samsung.com
wrote:
Hello,
On 2014-10-28 07:29, Andrew Morton wrote:
On Tue, 28 Oct 2014 15:24:44 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the akpm-current tree got a conflict in
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
mm/cma.c between commit 16195ddd4ebc ("mm: cma: Ensure that
reservations never cross the low/high mem boundary") from the
dma-mapping tree and commit 2a70e5a78672 ("mm/cma: ake kmemleak ignore
CMA regions") from the
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
mm/cma.c between commit 16195ddd4ebc (mm: cma: Ensure that
reservations never cross the low/high mem boundary) from the
dma-mapping tree and commit 2a70e5a78672 (mm/cma: ake kmemleak ignore
CMA regions) from the
20 matches
Mail list logo
