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

Merge in the left-over fixes before the net-next pull-request.

Conflicts:

drivers/net/ethernet/mediatek/mtk_ppe.c
  ae3ed15da588 ("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear")
  9d8cb4c096ab ("net: ethernet: mtk_eth_soc: add foe_entry_size to mtk_eth_soc")
https://lore.kernel.org/all/6cb6893b-4921-a068-4c30-1109795110bb@tessares.net/

kernel/bpf/helpers.c
  8addbfc7b308 ("bpf: Gate dynptr API behind CAP_BPF")
  5679ff2f138f ("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF")
  8a67f2de9b1d ("bpf: expose bpf_strtol and bpf_strtoul to all program types")
https://lore.kernel.org/all/20221003201957.13149-1-daniel@iogearbox.net/

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/atheros/alx/main.c
Simple merge

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

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/prestera/prestera_acl.c
Simple merge

diff --cc drivers/net/ethernet/marvell/prestera/prestera_acl.h
Simple merge

diff --cc drivers/net/ethernet/marvell/prestera/prestera_flower.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_ppe.c
index 887f430734f7479d37e24f6161142fe10cf717d5,148ea636ef9794d66892ae088caba319a7931f60..ae00e572390d7ba705f0a865d174c1b161ec7c36
--- 1/drivers/net/ethernet/mediatek/mtk_ppe.c
--- 2/drivers/net/ethernet/mediatek/mtk_ppe.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
@@@ -439,10 -410,9 +439,10 @@@ __mtk_foe_entry_clear(struct mtk_ppe *p
  
        hlist_del_init(&entry->list);
        if (entry->hash != 0xffff) {
 -              ppe->foe_table[entry->hash].ib1 &= ~MTK_FOE_IB1_STATE;
 -              ppe->foe_table[entry->hash].ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE,
 -                                                            MTK_FOE_STATE_INVALID);
 +              struct mtk_foe_entry *hwe = mtk_foe_get_entry(ppe, entry->hash);
 +
 +              hwe->ib1 &= ~MTK_FOE_IB1_STATE;
-               hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_UNBIND);
++              hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID);
                dma_wmb();
        }
        entry->hash = 0xffff;

diff --cc drivers/net/ethernet/microchip/sparx5/sparx5_main.h
Simple merge

diff --cc drivers/net/ethernet/sunplus/spl2sw_driver.c
Simple merge

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

diff --cc drivers/net/wwan/iosm/iosm_ipc_wwan.c
Simple merge

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

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

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

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

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

diff --cc kernel/bpf/helpers.c
index b069517a3da024263ff87dd8fbba9328ecf3a27d,3814b0fd3a2c5ef518d429660535b5c572f165ab..a6b04faed282bd3d9826a7931362a3aca60cde36
--- 1/kernel/bpf/helpers.c
--- 2/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@@ -1609,26 -1627,12 +1609,12 @@@ bpf_base_func_proto(enum bpf_func_id fu
                return &bpf_ringbuf_discard_proto;
        case BPF_FUNC_ringbuf_query:
                return &bpf_ringbuf_query_proto;
-       case BPF_FUNC_ringbuf_reserve_dynptr:
-               return &bpf_ringbuf_reserve_dynptr_proto;
-       case BPF_FUNC_ringbuf_submit_dynptr:
-               return &bpf_ringbuf_submit_dynptr_proto;
-       case BPF_FUNC_ringbuf_discard_dynptr:
-               return &bpf_ringbuf_discard_dynptr_proto;
 -      case BPF_FUNC_for_each_map_elem:
 -              return &bpf_for_each_map_elem_proto;
 -      case BPF_FUNC_loop:
 -              return &bpf_loop_proto;
        case BPF_FUNC_strncmp:
                return &bpf_strncmp_proto;
-       case BPF_FUNC_dynptr_from_mem:
-               return &bpf_dynptr_from_mem_proto;
-       case BPF_FUNC_dynptr_read:
-               return &bpf_dynptr_read_proto;
-       case BPF_FUNC_dynptr_write:
-               return &bpf_dynptr_write_proto;
-       case BPF_FUNC_dynptr_data:
-               return &bpf_dynptr_data_proto;
 +      case BPF_FUNC_strtol:
 +              return &bpf_strtol_proto;
 +      case BPF_FUNC_strtoul:
 +              return &bpf_strtoul_proto;
        default:
                break;
        }
@@@ -1657,12 -1661,20 +1643,26 @@@
                return &bpf_timer_cancel_proto;
        case BPF_FUNC_kptr_xchg:
                return &bpf_kptr_xchg_proto;
 +      case BPF_FUNC_for_each_map_elem:
 +              return &bpf_for_each_map_elem_proto;
 +      case BPF_FUNC_loop:
 +              return &bpf_loop_proto;
 +      case BPF_FUNC_user_ringbuf_drain:
 +              return &bpf_user_ringbuf_drain_proto;
+       case BPF_FUNC_ringbuf_reserve_dynptr:
+               return &bpf_ringbuf_reserve_dynptr_proto;
+       case BPF_FUNC_ringbuf_submit_dynptr:
+               return &bpf_ringbuf_submit_dynptr_proto;
+       case BPF_FUNC_ringbuf_discard_dynptr:
+               return &bpf_ringbuf_discard_dynptr_proto;
+       case BPF_FUNC_dynptr_from_mem:
+               return &bpf_dynptr_from_mem_proto;
+       case BPF_FUNC_dynptr_read:
+               return &bpf_dynptr_read_proto;
+       case BPF_FUNC_dynptr_write:
+               return &bpf_dynptr_write_proto;
+       case BPF_FUNC_dynptr_data:
+               return &bpf_dynptr_data_proto;
        default:
                break;
        }

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

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

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

diff --cc net/unix/af_unix.c
Simple merge

diff --cc net/vmw_vsock/virtio_transport_common.c
Simple merge

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

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

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

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