Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree

2020-09-15 Thread Christoph Hellwig
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.

RE: linux-next: manual merge of the akpm-current tree with the dma-mapping tree

2020-09-15 Thread Song Bao Hua (Barry Song)
> -Original Message- > From: Stephen Rothwell [mailto:s...@canb.auug.org.au] > Sent: Wednesday, September 16, 2020 4:12 PM > To: Andrew Morton ; Christoph Hellwig > > Cc: Mike Kravetz ; Song Bao Hua (Barry Song) > ; Linux Next Mailing List > ; Linux Kernel Mailing List > > Subject:

Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree

2019-06-17 Thread Christoph Hellwig
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

Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree

2014-10-28 Thread Andrew Morton
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

Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree

2014-10-28 Thread Marek Szyprowski
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")

Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree

2014-10-28 Thread Andrew Morton
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

Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree

2014-10-28 Thread Andrew Morton
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

Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree

2014-10-28 Thread Marek Szyprowski
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

Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree

2014-10-28 Thread Andrew Morton
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