| commit | 46857b57710f7b2088186d4fdd378083799ba6a7 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Feb 09 14:03:59 2015 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Mon Feb 09 14:03:59 2015 -0800 |
| tree | a39bb7c432f4e36467e61b316050e41ecd408b1f | |
| parent | 9dce285b70c157754d753203112cfef22770b1f9 [diff] | |
| parent | 35f05dabf95ac3ebc4c15bafd6833f7a3046e66f [diff] |
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>