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 tree and commit:
>
> 14de8ba3fa2e ("lib/genalloc.c: rename addr_in_gen_pool to
> gen_pool_has_addr")I really wish we could drop this pointless rename, and also the export until we have actual users.
