From: David S. Miller Date: Tue, 14 Sep 2021 12:09:54 +0000 (+0100) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf X-Git-Tag: v5.15-rc2~29^2~12 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2865ba82476a6b2603db40cfc1c8c0831409fb41;p=tomoyo%2Ftomoyo-test1.git Merge git://git./pub/scm/linux/kernel/git/bpf/bpf Daniel Borkmann says: ==================== pull-request: bpf 2021-09-14 The following pull-request contains BPF updates for your *net* tree. We've added 7 non-merge commits during the last 13 day(s) which contain a total of 18 files changed, 334 insertions(+), 193 deletions(-). The main changes are: 1) Fix mmap_lock lockdep splat in BPF stack map's build_id lookup, from Yonghong Song. 2) Fix BPF cgroup v2 program bypass upon net_cls/prio activation, from Daniel Borkmann. 3) Fix kvcalloc() BTF line info splat on oversized allocation attempts, from Bixuan Cui. 4) Fix BPF selftest build of task_pt_regs test for arm64/s390, from Jean-Philippe Brucker. 5) Fix BPF's disasm.{c,h} to dual-license so that it is aligned with bpftool given the former is a build dependency for the latter, from Daniel Borkmann with ACKs from contributors. ==================== Signed-off-by: David S. Miller --- 2865ba82476a6b2603db40cfc1c8c0831409fb41