Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 20 Jul 2023 22:05:03 +0000 (15:05 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 20 Jul 2023 22:52:55 +0000 (15:52 -0700)
Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
15 files changed:
1  2 
MAINTAINERS
drivers/net/dsa/microchip/ksz_common.c
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/dsa/qca/ar9331.c
drivers/net/ethernet/intel/ice/ice_base.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/igc/igc_main.c
drivers/net/ethernet/wangxun/libwx/wx_hw.c
include/linux/tcp.h
include/net/tcp.h
kernel/bpf/verifier.c
kernel/trace/trace_uprobe.c
net/ipv4/tcp.c
net/ipv4/tcp_ipv4.c
tools/build/feature/Makefile

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