projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e800072) | patch
mlx5: Fix merge errors.
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2016 02:05:13 +0000 (22:05 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2016 02:05:13 +0000 (22:05 -0400)
commit1de1d449c6cf701e09d2941d042b28328118ad1a
tree4c64064f62b94411598941dcd87f810e7db2e7d7tree | snapshot
parente800072c18f0d7b89a80fa46dceb3d080c80e09ccommit | 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>
drivers/net/ethernet/mellanox/mlx5/core/Kconfig diff | blob | history
drivers/net/ethernet/mellanox/mlx5/core/Makefile diff | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en.h diff | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff | blob | history
drivers/net/ethernet/mellanox/mlx5/core/vxlan.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.