Re: linux-next: manual merge of the rdma tree with the arm-soc tree

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

linux-next: manual merge of the rdma tree with the arm-soc tree

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