On Mon, Aug 7, 2017 at 9:20 PM, David Miller <da...@davemloft.net> wrote:
> From: Saeed Mahameed <sae...@mellanox.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
>> 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.
looks good, I will do some compilation testing later and if i find
anything i will post a patch.
Thanks a lot,