From: David S. Miller Date: Tue, 5 May 2015 23:39:13 +0000 (-0400) Subject: Merge branch 'mlx4' X-Git-Tag: firefly_0821_release~176^2~1783^2~30 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bc321ed2db8ee03b2f2ba809286d3bf4eef1e5e0;p=firefly-linux-kernel-4.4.55.git Merge branch 'mlx4' Or Gerlitz says: ==================== mlx4 fixes for 4.1-rc2 Eran's fix is for a small off-by-one introduces on 4.1-rc1. Yisahi fixes an issue with comes into play only on VMs with many (> 256) vCPUs. ==================== Signed-off-by: David S. Miller --- bc321ed2db8ee03b2f2ba809286d3bf4eef1e5e0