netdev - Re: [pull request][for-next 0/8] Mellanox, mlx5 shared 2017-08-07

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: <20170807.112052.332868856082904160.davem@davemloft.net>
Date:   Mon, 07 Aug 2017 11:20:52 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     saeedm@...lanox.com
Cc:     dledford@...hat.com, netdev@...r.kernel.org,
        linux-rdma@...r.kernel.org, leonro@...lanox.com
Subject: Re: [pull request][for-next 0/8] Mellanox, mlx5 shared 2017-08-07

From: Saeed Mahameed <saeedm@...lanox.com>
Date: Mon,  7 Aug 2017 13:18:00 +0300

> Hi Dave & Doug,
> 
> This series contains some low level updates for mlx5 core driver,
> to be shared as base code for net-next and rdma for-next mlx5
> 4.14 submissions.
> 
> Please find more information in the tag message below.
> 
> Please pull and let me know if there's any porblem.
> 
> Side note:
> This series merges cleanly with current net-next, but it will conflict with Jiri's patch
> "mlx5e: push cls_flower and mqprio setup_tc processing into separate functions"
> Which is under review.
> since this is shared code and must go to both rdma and net-next it has to be
> based on 4.13-rc4, so there is not much I can do about this.

I resolved the merge conflict as best as I could, please take a look.

Pulled, thanks.