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

Commit Message

Stephen Rothwell Nov. 25, 2020, 1:33 a.m. UTC

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.

Comments

Christoph Hellwig Nov. 25, 2020, 8:36 a.m. UTC | #1

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.

Patch

diff --cc include/linux/dma-mapping.h
index 199d85285246,2aaed35b556d..000000000000
--- a/include/linux/dma-mapping.h