David S. Miller c2f5c57d99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf ... Daniel Borkmann says: ==================== pull-request: bpf 2021-06-23 The following pull-request contains BPF updates for your *net* tree. We've added 14 non-merge commits during the last 6 day(s) which contain a total of 13 files changed, 137 insertions(+), 64 deletions(-). Note that when you merge net into net-next, there is a small merge conflict between 9f2470fbc4 ("skmsg: Improve udp_bpf_recvmsg() accuracy") from bpf with c49661aa6f ("skmsg: Remove unused parameters of sk_msg_wait_data()") from net-next. Resolution is to: i) net/ipv4/udp_bpf.c: take udp_msg_wait_data() and remove err parameter from the function, ii) net/ipv4/tcp_bpf.c: take tcp_msg_wait_data() and remove err parameter from the function, iii) for net/core/skmsg.c and include/linux/skmsg.h: remove the sk_msg_wait_data() implementation and its prototype in header. The main changes are: 1) Fix BPF poke descriptor adjustments after insn rewrite, from John Fastabend. 2) Fix regression when using BPF_OBJ_GET with non-O_RDWR flags, from Maciej Żenczykowski. 3) Various bug and error handling fixes for UDP-related sock_map, from Cong Wang. 4) Fix patching of vmlinux BTF IDs with correct endianness, from Tony Ambardar. 5) Two fixes for TX descriptor validation in AF_XDP, from Magnus Karlsson. 6) Fix overflow in size calculation for bpf_map_area_alloc(), from Bui Quang Minh. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2021-06-23 14:12:14 -07:00
..
acpi
asm-generic	vmlinux.lds.h: Avoid orphan section with !SMP	2021-06-02 12:43:55 -07:00
clocksource
crypto
drm
dt-bindings	dt-bindings: connector: Add PD rev 2.0 VDO definition	2021-06-04 11:43:01 +02:00
keys	integrity-v5.13	2021-05-01 15:32:18 -07:00
kunit
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf	2021-06-23 14:12:14 -07:00
math-emu
media
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf	2021-06-23 14:12:14 -07:00
pcmcia
ras
rdma
scsi
soc	Networking changes for 5.13.	2021-04-29 11:57:23 -07:00
sound	ASoC: Fixes for v5.13	2021-05-25 08:58:01 +02:00
target
trace	NFS client updates for Linux 5.13	2021-05-07 11:23:41 -07:00
uapi	Networking fixes for 5.13-rc7, including fixes from wireless, bpf,	2021-06-18 18:55:29 -07:00
vdso
video
xen	xen/arm: move xen_swiotlb_detect to arm/swiotlb-xen.h	2021-05-14 15:52:05 +02:00