Merge branch 'mlx4_bond_notify'
authorDavid S. Miller <davem@davemloft.net>
Mon, 9 Feb 2015 22:03:59 +0000 (14:03 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Feb 2015 22:03:59 +0000 (14:03 -0800)
commit46857b57710f7b2088186d4fdd378083799ba6a7
treea39bb7c432f4e36467e61b316050e41ecd408b1f
parent9dce285b70c157754d753203112cfef22770b1f9
parent35f05dabf95ac3ebc4c15bafd6833f7a3046e66f
Merge branch 'mlx4_bond_notify'

Or Gerlitz says:

====================
bonding and mlx4 fixes for the HA/LAG support and mlx4 reset flow

There are two fixes to the boding + mlx4 HA/LAG support from Moni and a patch from Yishai
which does further hardening of the mlx4 reset support for IB kernel ULPs.
====================

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