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

Merge in the fixes we had queued in case there was another -rc.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/phy/phylink.c
Simple merge

diff --cc net/bridge/br_private.h
Simple merge

diff --cc net/core/flow_dissector.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

diff --cc tools/testing/selftests/net/Makefile
Simple merge