tree f5dbb21663ed267c5c32606fa4a9ba9a328bed3f
parent f985c65c908f6b26c30019a83dc5ea295f5fcf62
parent 2b3ddf27f48c8061f0676c5a8796008099945280
author David S. Miller <davem@davemloft.net> 1444875290 -0700
committer David S. Miller <davem@davemloft.net> 1444875290 -0700

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>