tree 2c5a619c8aee5ef68028a65a1c059736b005846b
parent 346e320cb2103edef709c4466a29140c4a8e527a
parent 2ecbc1f684482b4ed52447a39903bd9b0f222898
author Jakub Kicinski <kuba@kernel.org> 1602791001 -0700
committer Jakub Kicinski <kuba@kernel.org> 1602791001 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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>