[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CA+55aFxtX874DwJpE9SDurahJrE1LKLCNZL0qRWW8G26jWBKxw@mail.gmail.com>
Date: Wed, 23 Mar 2016 16:23:04 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Or Gerlitz <gerlitz.or@...il.com>
Cc: Doug Ledford <dledford@...hat.com>,
Stephen Rothwell <sfr@...b.auug.org.au>,
David Miller <davem@...emloft.net>,
Network Development <netdev@...r.kernel.org>,
linux-next <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree
On Wed, Mar 23, 2016 at 4:04 PM, Or Gerlitz <gerlitz.or@...il.com> 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.
Linus
Powered by blists - more mailing lists