From: David S. Miller Date: Mon, 9 Feb 2015 22:03:59 +0000 (-0800) Subject: Merge branch 'mlx4_bond_notify' X-Git-Tag: v4.0-rc1~133^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=46857b57710f7b2088186d4fdd378083799ba6a7;p=karo-tx-linux.git 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 --- 46857b57710f7b2088186d4fdd378083799ba6a7