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

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
  8e21426fea38 ("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear")
  f88c74abe3ce ("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
  c522fd92f478 ("bpf: Gate dynptr API behind CAP_BPF")
  2469008f7dea ("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF")
  154bb444fe6e ("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>