From: David S. Miller Date: Thu, 25 Jun 2015 09:06:33 +0000 (-0700) Subject: Merge branch 'mlx4' X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=be35ffa38e48da6402f08e10988dc9969ca92962;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge branch 'mlx4' Or Gerlitz says: ==================== mlx4 driver fixes, June 24, 2015 Some fixes that we made recently, all need to go into stable. patch #1 "net/mlx4_en: Release TX QP when destroying TX ring" and patch #3 "Fix wrong csum complete report when rxvlan offload is disabled" to >= 3.19 patch #2 "Wake TX queues only when there's enough room" addressing a bug which is there from day one... should go to whatever kernels it's still applicable patch #4 "mlx4: Disable HA for SRIOV PF RoCE devices" to >= 4.0 The patches are marked with net but are made against net-next, as the net tree still doesn't contain all the net-next bits. ==================== Signed-off-by: David S. Miller --- be35ffa38e48da6402f08e10988dc9969ca92962