Hi David, hi Jakub, The following pull-request contains BPF updates for your *net* tree. We've added 4 non-merge commits during the last 10 day(s) which contain a total of 4 files changed, 14 insertions(+), 7 deletions(-). The main changes are: 1) Fix task_iter bug caused by the merge conflict resolution, from Yonghong. 2) Fix resolve_btfids for multiple type hierarchies, from Jiri. Please consider pulling these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Thanks a lot! Also thanks to reporters, reviewers and testers of commits in this pull-request: Andrii Nakryiko, John Fastabend, Martin KaFai Lau, Song Liu ---------------------------------------------------------------- The following changes since commit 4bfc4714849d005e6835bcffa3c29ebd6e5ee35d: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (2020-12-28 15:26:11 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git for you to fetch changes up to 6f02b540d7597f357bc6ee711346761045d4e108: bpftool: Fix compilation failure for net.o with older glibc (2021-01-06 15:27:38 -0800) ---------------------------------------------------------------- Alan Maguire (1): bpftool: Fix compilation failure for net.o with older glibc Jiang Wang (1): selftests/bpf: Fix a compile error for BPF_F_BPRM_SECUREEXEC Jiri Olsa (1): tools/resolve_btfids: Warn when having multiple IDs for single type Yonghong Song (1): bpf: Fix a task_iter bug caused by a merge conflict resolution kernel/bpf/task_iter.c | 1 + tools/bpf/bpftool/net.c | 1 - tools/bpf/resolve_btfids/main.c | 17 ++++++++++++----- tools/testing/selftests/bpf/progs/bprm_opts.c | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-)
