[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180323.133616.109678949206778090.davem@davemloft.net>
Date: Fri, 23 Mar 2018 13:36:16 -0400 (EDT)
From: David Miller <davem@...emloft.net>
To: jgg@...lanox.com
Cc: netdev@...r.kernel.org, dledford@...hat.com, idosch@...lanox.com,
dsahern@...il.com, sd@...asysnail.net
Subject: Re: [GIT] 'net' merged into 'net-next'
From: Jason Gunthorpe <jgg@...lanox.com>
Date: Fri, 23 Mar 2018 11:26:22 -0600
> On Fri, Mar 23, 2018 at 11:40:59AM -0400, David Miller wrote:
>>
>> This merge was a little bit more hectic than usual.
>>
>> But thankfully, I had some sample conflict resolutions to work
>> with, in particular for the mlx5 infiniband changes which were
>> the most difficult to resolve.
>>
>> Please double check my work and provide any fixup patches if
>> necessary.
>
> The drivers/infiniband looks OK, and I also checked that merging
> netdev and rdma together gets us to the right result.
Thanks for looking at it.
Powered by blists - more mailing lists