Merge 'bpf-next 2023-10-16' into loongarch-next

LoongArch architecture changes for 6.7 (BPF CPU v4 support) depend on
the bpf changes to fix conflictions in selftests and work, so merge them
to create a base.

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/net/dsa/bcm_sf2.c
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_main.c
Simple merge

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

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

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

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

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

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/renesas/ravb_main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/rswitch.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/ti/icssg/icssg_config.c
Simple merge

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.c
Simple merge

diff --cc drivers/net/gtp.c
Simple merge

diff --cc drivers/ptp/ptp_ocp.c
Simple merge

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

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

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

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

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

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

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

diff --cc mm/kasan/kasan.h
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc net/l2tp/l2tp_ip6.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_sync.c
Simple merge

diff --cc net/tls/tls_sw.c
Simple merge

diff --cc net/vmw_vsock/virtio_transport.c
index b80bf68,09ba312..fdb95da
--- 1/net/vmw_vsock/virtio_transport.c
--- 2/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@@ -677,8 -738,10 +752,11 @@@ static int virtio_vsock_probe(struct vi
        if (ret < 0)
                goto out;
  
+       for (i = 0; i < ARRAY_SIZE(vsock->out_sgs); i++)
+               vsock->out_sgs[i] = &vsock->out_bufs[i];
+ 
        rcu_assign_pointer(the_virtio_vsock, vsock);
 +      virtio_vsock_vqs_start(vsock);
  
        mutex_unlock(&the_virtio_vsock_mutex);
  

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

diff --cc tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
Simple merge

diff --cc tools/testing/selftests/bpf/prog_tests/timer.c
Simple merge