Re: linux-next: manual merge of the rdma tree with the pci tree

[Doug Ledford]

On 5/4/2017 8:19 PM, Stephen Rothwell wrote:
> Hi Doug,
> 
> Today's linux-next merge of the rdma tree got a conflict in:
> 
>   drivers/infiniband/hw/hfi1/hfi.h
> 
> between commit:
> 
>   21c433a74b6b ("IB/hfi1: Use pcie_flr() instead of duplicating it")
> 
> from the pci tree and commit:
> 
>   f4cd87652919 ("IB/hfi1: Name function prototype parameters")
> 
> 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.
> 

This is not unexpected entirely, only unexpected in that the PCI tree
hasn't been merged yet ;-).  The first commit was part of a series that
was mainly a PCI series that just touched hfi1, so it's entirely
understandable that it went through the PCI tree and something in my
tree might happen, as it were, to touch the same area.  Your fix was
fine and I'm sure Linus can sort the same thing out.  Thanks ;-)

-- 
Doug Ledford <dledford@xxxxxxxxxx>
    GPG Key ID: B826A3330E572FDD
    Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD

Attachment: signature.asc
Description: OpenPGP digital signature