> -----Original Message-----
> From: Stephen Rothwell [mailto:[email protected]]
> Sent: Wednesday, September 16, 2020 4:12 PM
> To: Andrew Morton <[email protected]>; Christoph Hellwig
> <[email protected]>
> Cc: Mike Kravetz <[email protected]>; Song Bao Hua (Barry Song)
> <[email protected]>; Linux Next Mailing List
> <[email protected]>; Linux Kernel Mailing List
> <[email protected]>
> 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-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
> 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.
Will it be better to go through Christoph's tree?
>
> I fixed it up (I just used the latter version) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
Thanks
Barry
