FWIW this will go away in a day or two. I merged mlx5-next into rdma
for-next in order to take a series that depended on it.
On Wed, 2018-12-05 at 12:07 +1100, Stephen Rothwell wrote:
> Hi Leon,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/main.c
> drivers/infiniband/hw/mlx5/mlx5_ib.h
>
> between commit:
>
> 36e235c88299 ("RDMA/mlx5: Use the uapi disablement APIs instead of code")
>
> from the rdma tree and commit:
>
> 81773ce5f07f ("RDMA/mlx5: Use stages for callback to setup and release DEVX")
>
> 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.
>
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
Attachment:
signature.asc
Description: This is a digitally signed message part
