git.kernel.dk Git - linux-block.git/commit - drivers/gpu/drm/amd/amdgpu/gfx_v11

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 2 May 2024 19:05:13 +0000 (12:05 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 2 May 2024 19:06:25 +0000 (12:06 -0700)
commit	e958da0ddbe831197a0023251880a4a09d5ba268
tree	eacded26f9563064a44fd1afe730493898adadb9	tree \| snapshot
parent	dcc61472534e48a200262fd297ab21f8dd94d6cc	commit \| diff
parent	545c494465d24b10a4370545ba213c0916f70b95	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

include/linux/filter.h
kernel/bpf/core.c
66e13b615a0c ("bpf: verifier: prevent userspace memory access")
d503a04f8bc0 ("bpf: Add support for certain atomics in bpf_arena to x86 JIT")
https://lore.kernel.org/all/20240429114939.210328b0@canb.auug.org.au/

No adjacent changes.

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

22 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/net/bpf_jit_32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
arch/riscv/net/bpf_jit_comp64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan/vxlan_core.c	diff1 \|	diff2 \|	blob \| history
fs/ntfs3/ntfs_fs.h	diff1 \|	diff2 \|	blob \| history
fs/ntfs3/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
include/linux/skmsg.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/gro.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/net/bpf_jit_32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
arch/riscv/net/bpf_jit_comp64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan/vxlan_core.c	diff1 \|	diff2 \|	blob \| history
fs/ntfs3/ntfs_fs.h	diff1 \|	diff2 \|	blob \| history
fs/ntfs3/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
include/linux/skmsg.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/gro.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c	diff1 \|	diff2 \|	blob \| history