Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

diff --cc .mailmap
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
Simple merge

diff --cc drivers/net/ethernet/marvell/octeon_ep/octep_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeon_ep/octep_main.h
Simple merge

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
Simple merge

diff --cc drivers/net/phy/realtek/realtek_main.c
Simple merge

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

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

diff --cc net/bluetooth/mgmt.c
Simple merge

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

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

diff --cc net/ipv4/esp4.c
Simple merge

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

diff --cc net/sched/sch_api.c
Simple merge

diff --cc net/xfrm/xfrm_output.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc net/xfrm/xfrm_replay.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge

diff --cc scripts/Makefile
Simple merge

diff --cc scripts/checkpatch.pl
Simple merge