On Fri, Jul 1, 2016 at 1:16 PM, David Miller <da...@davemloft.net> wrote:
>
> So you have submitted to me, in parallel, two non-trivial sets of changes
> to the mlx5 driver. One for 'net' and one for 'net-next, and at the same
> exact time.
>
> You haven't given me any indication of whether there are any dependencies
> nor conflicts from these two sets of changes.
>
Right,
Now that i see you've merged 'f5074d0ce2f8 Merge branch
'mlx5-100G-fixes'' ino net-next
the last patch "net/mlx5e: Introduce SRIOV VF representors" will
encounter the following compilation error
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c: In function
'mlx5e_rep_get_strings':
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c:68:31: error: 'const
struct counter_desc' has no member named 'name'
sw_rep_stats_desc[i].name);
I will rebase, fix and respin.
Regarding the latest fixes you applied today ''resiliency and xmit
path fixes", there will be two trivial conflicts (not related to this
series) once net is merged into net-next.
I will send you details on that mail thread.
