From: David S. Miller <davem@davemloft.net>
Date: Thu, 23 Feb 2017 15:57:58 +0000 (-0500)
Subject: Merge branch 'mlx4-misc-fixes'
X-Git-Tag: android-x86-8.1-r1~4065^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e65ade77e87fd206bb78fae32ab7b604b01fade0;p=android-x86%2Fkernel.git

Merge branch 'mlx4-misc-fixes'

Tariq Toukan says:

====================
mlx4 misc fixes

This patchset contains misc bug fixes from Eric Dumazet and our team
to the mlx4 Core and Eth drivers.

Series generated against net commit:
eee2faabc63d tcp: account for ts offset only if tsecr not zero

v3:
* Rebased, conflict solved.

v2:
* Added Eric's fix (patch 5/5).
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

e65ade77e87fd206bb78fae32ab7b604b01fade0