netdev - Re: [GIT] 'net' merged into 'net-next'

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180323172622.GC13003@mellanox.com>
Date:   Fri, 23 Mar 2018 11:26:22 -0600
From:   Jason Gunthorpe <jgg@...lanox.com>
To:     David Miller <davem@...emloft.net>
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'

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.

Jason