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

No conflicts.

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

diff --cc arch/x86/events/intel/core.c
Simple merge

diff --cc drivers/net/ethernet/google/gve/gve.h
Simple merge

diff --cc drivers/net/ethernet/google/gve/gve_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_lif.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

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

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Simple merge

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

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

diff --cc include/net/sock.h
Simple merge

diff --cc include/soc/mscc/ocelot_vcap.h
Simple merge

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

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

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc tools/lib/bpf/libbpf.c
Simple merge