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

From: Linus Torvalds
Date: Wed Mar 23 2016 - 19:23:12 EST

On Wed, Mar 23, 2016 at 4:04 PM, Or Gerlitz <gerlitz.or@xxxxxxxxx> wrote:
> I know there's history here, and in the 4.5 cycle things were much
> worse, but I still wanted to put things in their more precise place,
> if you don't mind.

We'll see how things shape up in the future. Once bitten, twice shy,
as they say.

Please make sure that Mellanox will not be a pain going forward, and
everything will be forgiven/forgotten.