Merge branch 'tcp_nv'
authorDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2016 06:07:50 +0000 (23:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2016 06:07:50 +0000 (23:07 -0700)
Lawrence Brakmo says:

====================
tcp: add NV congestion control

Removed most of the module parameters

Tested in a rack using between 1 and 380 active TCP-NV flows.

Consists of the following patches:
[PATCH net-next v2 1/2] tcp: add in_flight to tcp_skb_cb
[PATCH net-next v2 2/2] tcp: add NV congestion control
====================

Signed-off-by: Lawrence Brakmo <brakmo@fb.com>

Trivial merge