git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Tue, 10 May 2016 02:05:13 +0000 (22:05 -0400)
committer	David S. Miller <davem@davemloft.net>
	Tue, 10 May 2016 02:05:13 +0000 (22:05 -0400)
commit	516586926ec93d58c5ae4d24b4a7711a24c37938
tree	4c64064f62b94411598941dcd87f810e7db2e7d7	tree \| snapshot
parent	76b9efe51ec395eb9a8b2fdb078081e81ce07c28	commit \| 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>

Linux Kernel Source Tree.

RSS Atom

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