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

[Stephen Rothwell]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/dma-mapping.h
index 199d85285246,2aaed35b556d..000000000000
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@@ -558,6 -558,11 +558,4 @@@ static inline int dma_mmap_wc(struct de
  #define dma_unmap_len_set(PTR, LEN_NAME, VAL)    do { } while (0)
  #endif
  
- extern const struct dma_map_ops dma_virt_ops;
 -/*
 - * Legacy interface to set up the dma offset map.  Drivers really should not
 - * actually use it, but we have a few legacy cases left.
 - */
 -int dma_direct_set_offset(struct device *dev, phys_addr_t cpu_start,
 -		dma_addr_t dma_start, u64 size);
--
  #endif /* _LINUX_DMA_MAPPING_H */

Attachment: pgp3oqk86hw12.pgp
Description: OpenPGP digital signature