linux/net/mptcp
David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The mptcp conflict was overlapping additions.

The SMC conflict was an additional and removal happening at the same
time.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-02-27 18:31:39 -08:00
..
Kconfig mptcp: select CRYPTO 2020-02-16 19:37:16 -08:00
Makefile mptcp: new sysctl to control the activation per NS 2020-01-24 13:44:08 +01:00
crypto.c mptcp: move from sha1 (v0) to sha256 (v1) 2020-01-24 13:44:08 +01:00
ctrl.c mptcp: new sysctl to control the activation per NS 2020-01-24 13:44:08 +01:00
options.c mptcp: process MP_CAPABLE data option 2020-01-24 13:44:08 +01:00
protocol.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-02-27 18:31:39 -08:00
protocol.h mptcp: avoid work queue scheduling if possible 2020-02-26 20:46:26 -08:00
subflow.c mptcp: avoid work queue scheduling if possible 2020-02-26 20:46:26 -08:00
token.c mptcp: Add key generation and token tree 2020-01-24 13:44:07 +01:00