![]() Minor conflicts in net/mptcp/protocol.h and tools/testing/selftests/net/Makefile. In both cases code was added on both sides in the same place so just keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
tls_device.c | ||
tls_device_fallback.c | ||
tls_main.c | ||
tls_proc.c | ||
tls_sw.c | ||
tls_toe.c | ||
trace.c | ||
trace.h |