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

[Linus Torvalds]

On Wed, Mar 16, 2016 at 1:52 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> How about "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 want also want to
> consider cooperate with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts."

Yup, sounds fine.

Maybe you could even say "don't merge this to hide the problem",
because that has been another reaction in the past, but the above
already sounds pretty good.

                Linus