www.infradead.org Git - users/dwmw2/linux.git/commit

]> www.infradead.org Git - users/dwmw2/linux.git/commit

projects / users / dwmw2 / linux.git / commit

author	Huacai Chen <chenhuacai@loongson.cn>
	Wed, 1 Nov 2023 02:55:00 +0000 (10:55 +0800)
committer	Huacai Chen <chenhuacai@loongson.cn>
	Wed, 1 Nov 2023 02:55:00 +0000 (10:55 +0800)
commit	a6bdc082ad1c91d389a6ba0c7a1945818f732114
tree	fa630701d5d2a8bc1ab8c4abf759663bbb81aeeb	tree
parent	ffc253263a1375a65fa6c9f62a893e9767fbebfa	commit \| diff
parent	99c9991f4e5d77328187187d0c921a3b62bfa998	commit \| diff

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.

43 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/s390/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/bcm_sf2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/apm/xgene/xgene_enet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/iavf/iavf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_virtchnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeon_ep/octep_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/ravb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/rswitch.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_config.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_prueth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gtp.c	diff1 \|	diff2 \|	blob \| history
drivers/ptp/ptp_ocp.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/kasan.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/memalloc.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
mm/kasan/kasan.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip6.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_sync.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/prog_tests/timer.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/s390/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/bcm_sf2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/apm/xgene/xgene_enet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/iavf/iavf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_virtchnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeon_ep/octep_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/ravb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/rswitch.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_config.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_prueth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gtp.c	diff1 \|	diff2 \|	blob \| history
drivers/ptp/ptp_ocp.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/kasan.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/memalloc.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
mm/kasan/kasan.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip6.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_sync.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/prog_tests/timer.c	diff1 \|	diff2 \|	blob \| history