On Wed, Nov 25, 2020 at 12:33:51PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> include/linux/dma-mapping.h
>
> between commit:
>
> 16fee29b0735 ("dma-mapping: remove the dma_direct_set_offset export")
>
> from the arm-soc tree and commit:
>
> 172292be01db ("dma-mapping: remove dma_virt_ops")
>
> from the rdma tree.
>
> I fixed it up (see below) 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.
Thanks, the trivial fixup looks obviously good.
