| commit | 1de1d449c6cf701e09d2941d042b28328118ad1a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon May 09 22:05:13 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Mon May 09 22:05:13 2016 -0400 |
| tree | 4c64064f62b94411598941dcd87f810e7db2e7d7 | |
| parent | e800072c18f0d7b89a80fa46dceb3d080c80e09c [diff] |
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>