Conflicts: tools/testing/selftests/net/config62199e3f16
("selftests: net: Add VXLAN MDB test")3a0385be13
("selftests: add the missing CONFIG_IP_SCTP in net config") Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Conflicts: tools/testing/selftests/net/config62199e3f16
("selftests: net: Add VXLAN MDB test")3a0385be13
("selftests: add the missing CONFIG_IP_SCTP in net config") Signed-off-by: Jakub Kicinski <kuba@kernel.org>