From: David S. Miller Date: Thu, 30 Oct 2014 23:49:20 +0000 (-0400) Subject: Merge branch 'mellanox-net' X-Git-Tag: firefly_0821_release~176^2~2938^2~14 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=292dd6542f90126826fe87b302e6afa3b7ada6b8;p=firefly-linux-kernel-4.4.55.git Merge branch 'mellanox-net' Or Gerlitz says: ==================== mlx4 driver encapsulation/steering fixes The 1st patch fixes a bug in the TX path that supports offloading the TX checksum of (VXLAN) encapsulated TCP packets. It turns out that the bug is revealed only when the receiver runs in non-offloaded mode, so we somehow missed it so far... please queue it for -stable >= 3.14 The 2nd patch makes sure not to leak steering entry on error flow, please queue it to 3.17-stable ==================== Signed-off-by: David S. Miller --- 292dd6542f90126826fe87b302e6afa3b7ada6b8