-
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netJakub Kicinski authored
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>
2295cddfgit://git.kernel.org/pub/scm/linux/kernel/git/netdev/netJakub Kicinski authoredMinor 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:
Loading