Messages in this thread | | | Date | Wed, 16 Sep 2020 06:35:24 +0200 | From | Christoph Hellwig <> | Subject | Re: linux-next: manual merge of the akpm-current tree with the dma-mapping tree |
| |
On Wed, Sep 16, 2020 at 04:22:03AM +0000, 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.
It wasn't.
> Will it be better to go through Christoph's tree?
I don't think this merge is much of a problem, we'll just need to tell Linus about it.
| |