From: Jakub Kicinski Date: Sat, 28 Nov 2020 20:04:56 +0000 (-0800) Subject: Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf X-Git-Tag: v5.10-rc7~20^2~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3771b822422fd999fbcd30c7e8302d251be0bb75;p=thirdparty%2Fkernel%2Flinux.git Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf Daniel Borkmann says: ==================== pull-request: bpf 2020-11-28 1) Do not reference the skb for xsk's generic TX side since when looped back into RX it might crash in generic XDP, from Björn Töpel. 2) Fix umem cleanup on a partially set up xsk socket when being destroyed, from Magnus Karlsson. 3) Fix an incorrect netdev reference count when failing xsk_bind() operation, from Marek Majtyka. 4) Fix bpftool to set an error code on failed calloc() in build_btf_type_table(), from Zhen Lei. * https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf: bpf: Add MAINTAINERS entry for BPF LSM bpftool: Fix error return value in build_btf_type_table net, xsk: Avoid taking multiple skbuff references xsk: Fix incorrect netdev reference count xsk: Fix umem cleanup bug at socket destruct MAINTAINERS: Update XDP and AF_XDP entries ==================== Link: https://lore.kernel.org/r/20201128005104.1205-1-daniel@iogearbox.net Signed-off-by: Jakub Kicinski --- 3771b822422fd999fbcd30c7e8302d251be0bb75