diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-15 05:14:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-15 05:14:50 +0300 |
| commit | f6bba8945e7cff591127be1f6992c3e466cfff4c (patch) | |
| tree | f5dbb21663ed267c5c32606fa4a9ba9a328bed3f /net/switchdev/switchdev.c | |
| parent | f985c65c908f6b26c30019a83dc5ea295f5fcf62 (diff) | |
| parent | 2b3ddf27f48c8061f0676c5a8796008099945280 (diff) | |
| download | linux-f6bba8945e7cff591127be1f6992c3e466cfff4c.tar.xz | |
Merge branch 'mlx-next'
Or Gerlitz says:
====================
Mellanox driver update, Oct 14 2015
This series contains two more patches from Eli, patch from Majd
to support PCI error handlers and a fix from Jack to mlx4 VFs
when probed without a provisioned mac address.
The patch set applied on top of net-next commit bbb300e "Merge branch 'bridge-vlan'"
changes from V0:
- made the health flag int --> bool to address comment from Dave on patch #1
- fixed sparse warning noted by the 0-day build tests in patch #2
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions