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

Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/dsa/qca/ar9331.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_base.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_main.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/libwx/wx_hw.c
Simple merge

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

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

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

diff --cc kernel/trace/trace_uprobe.c
Simple merge

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

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

diff --cc tools/build/feature/Makefile
Simple merge