linux-next: manual merge of the mlx5-next tree with the rdma tree

[Mark Brown]

Hi all,

Today's linux-next merge of the mlx5-next tree got a conflict in:

  drivers/infiniband/hw/mlx5/data_direct.c

between commit:

  08a978db86e87 ("RDMA/mlx5: Remove obsolete 32-bit DMA mask fallback")

from the rdma tree and commit:

  00290b9ff59ef ("mlx5: Move data direct implementation to mlx5_core")

from the mlx5-next 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.

(deleted the file)

Attachment: signature.asc
Description: PGP signature