tree a7dc22fa7481300c92c0a33b54a32cb9ee551b5f
parent ec4a514a6870ee3a83fb8788635cf871ee32e665
parent 7058b837899fc978c9f8a033fa29ab07360a85c8
author David S. Miller <davem@davemloft.net> 1582857099 -0800
committer David S. Miller <davem@davemloft.net> 1582857099 -0800

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>