Merge branch 'mlx'

Browse source

Or Gerlitz says:

====================
Mellanox driver update to 4.3-rc4

Small set of fixes for net, which includes Carol's patches, a fix
from Achiad to have the right behaviour for mlx5 Eth devices w.r.t
VLANs in promiscuous mode, a good-bye patch from Ido who left Mellanox
and the 1st patch from Jiri to our NIC drivers (I love one-liners)...
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-10-09 07:44:04 -07:00

parent 85121d6ee6 d5a52095af

commit ca7beb1fa7

4 changed files with 19 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

MAINTAINERS

View file

4

drivers/net/ethernet/mellanox/mlx4/eq.c

View file

16

drivers/net/ethernet/mellanox/mlx5/core/en_flow_table.c

View file

2

drivers/net/ethernet/mellanox/mlx5/core/port.c

View file