linux-next: manual merge of the rdma-leon tree with Linus' tree

From: Stephen Rothwell
Date: Sun Feb 12 2017 - 18:30:52 EST

Hi Leon,

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


between commit:

646ebd4166ca ("RDMA: Don't reference kernel private header from UAPI header")

from Linus' tree and commit:

39bfb78f4acb ("RDMA: Remove kernel private defines and reference to header from UAPI")

from the rdma-leon tree.

More or less the same patch.

I fixed it up (I used the version from Linus' tree (as it contains
explanatory comments)) 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.

Stephen Rothwell