diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-10 05:05:13 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-10 05:05:13 +0300 |
| commit | 1de1d449c6cf701e09d2941d042b28328118ad1a (patch) | |
| tree | 4c64064f62b94411598941dcd87f810e7db2e7d7 /drivers/net/fjes | |
| parent | e800072c18f0d7b89a80fa46dceb3d080c80e09c (diff) | |
| download | linux-1de1d449c6cf701e09d2941d042b28328118ad1a.tar.xz | |
mlx5: Fix merge errors.
I accidently let Arnd's VXLAN dependency changes slip into net-next,
they are only appropriate for net.
Also the flow steering structural changes to mlx5e_priv got scrambled
during the merge resolution as well.
Fix that all up.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/fjes')
0 files changed, 0 insertions, 0 deletions