| commit | 9f6e055907362f6692185c1c9658295d24095c74 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Feb 27 18:31:39 2020 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Thu Feb 27 18:31:39 2020 -0800 |
| tree | a7dc22fa7481300c92c0a33b54a32cb9ee551b5f | |
| parent | ec4a514a6870ee3a83fb8788635cf871ee32e665 [diff] | |
| parent | 7058b837899fc978c9f8a033fa29ab07360a85c8 [diff] |
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>