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

No conflicts.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc include/linux/phylink.h
Simple merge

diff --cc kernel/bpf/core.c
Simple merge