Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Tue, 4 Oct 2022 00:44:18 +0000 (17:44 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 4 Oct 2022 00:44:18 +0000 (17:44 -0700)
commite52f7c1ddf3e47243c330923ea764e7ccfbe99f7
treeb7caf07ec39e08cb10e6441966dc1ba5b6cfde15
parent2a4187f4406ec3236f8b9d0d5150d2bf8d021b68
parent0152dfee235e87660f52a117fc9f70dc55956bb4
Merge git://git./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>
27 files changed:
MAINTAINERS
drivers/net/ethernet/atheros/alx/main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
drivers/net/ethernet/marvell/prestera/prestera_acl.c
drivers/net/ethernet/marvell/prestera/prestera_acl.h
drivers/net/ethernet/marvell/prestera/prestera_flower.c
drivers/net/ethernet/mediatek/mtk_ppe.c
drivers/net/ethernet/microchip/sparx5/sparx5_main.h
drivers/net/ethernet/sunplus/spl2sw_driver.c
drivers/net/usb/r8152.c
drivers/net/wwan/iosm/iosm_ipc_wwan.c
include/linux/tcp.h
include/net/tcp.h
include/uapi/linux/bpf.h
kernel/bpf/btf.c
kernel/bpf/cgroup.c
kernel/bpf/helpers.c
kernel/bpf/syscall.c
net/ipv4/tcp.c
net/rds/tcp.c
net/unix/af_unix.c
net/vmw_vsock/virtio_transport_common.c
net/xfrm/xfrm_input.c
net/xfrm/xfrm_ipcomp.c
tools/include/uapi/linux/bpf.h
tools/testing/selftests/bpf/xskxceiver.c