From: David S. Miller Date: Thu, 15 Oct 2015 02:14:50 +0000 (-0700) Subject: Merge branch 'mlx-next' X-Git-Tag: firefly_0821_release~176^2~818^2~128 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f6bba8945e7cff591127be1f6992c3e466cfff4c;p=firefly-linux-kernel-4.4.55.git 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 --- f6bba8945e7cff591127be1f6992c3e466cfff4c