Re: linux-next: manual merge of the akpm tree with the tip tree
From: Ingo Molnar
Date: Thu Mar 10 2016 - 03:00:44 EST
* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Andrew,
> Today's linux-next merge of the akpm tree got a conflict in:
> between commit:
> f6e45661f9be ("dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()")
> from the tip tree and patch:
> "dma-mapping: rename dma_*_writecombine() to dma_*_wc()"
> from the akpm tree.
> These a basically the same patch, so I dropped the one from the akpm tree.
Andrew, what's your preference for merging it? I can drop it too.