diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-23 10:57:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-23 10:57:58 -0500 |
| commit | e65ade77e87fd206bb78fae32ab7b604b01fade0 (patch) | |
| tree | e6c093d33d61dd9c2eeb7c7f77c9f4c26aea3655 /net/l2tp | |
| parent | c12f4d761dd2313ae4f457041df3ec0c603aa76a (diff) | |
| parent | 7f0137e2ef9f32143df623001a96f7aab61a9595 (diff) | |
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>
Diffstat (limited to 'net/l2tp')
0 files changed, 0 insertions, 0 deletions