diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-13 15:28:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-13 15:28:08 -0700 |
| commit | fa7566a0d68f8467846cba8ec29f1551b0a42de9 (patch) | |
| tree | c520797b309d68cacd4bb9089473af7bf8644f07 /scripts | |
| parent | bf97bac9dc6481e9f68992e52bed5cc4b210e636 (diff) | |
| parent | 29fcb05bbf1a7008900bb9bee347bdbfc7171036 (diff) | |
| download | linux-fa7566a0d68f8467846cba8ec29f1551b0a42de9.tar.gz linux-fa7566a0d68f8467846cba8ec29f1551b0a42de9.tar.bz2 linux-fa7566a0d68f8467846cba8ec29f1551b0a42de9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-06-12
The following pull-request contains BPF updates for your *net* tree.
We've added 26 non-merge commits during the last 10 day(s) which contain
a total of 27 files changed, 348 insertions(+), 93 deletions(-).
The main changes are:
1) sock_hash accounting fix, from Andrey.
2) libbpf fix and probe_mem sanitizing, from Andrii.
3) sock_hash fixes, from Jakub.
4) devmap_val fix, from Jesper.
5) load_bytes_relative fix, from YiFei.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/link-vmlinux.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 57cb14bd8925..92dd745906f4 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -143,8 +143,8 @@ gen_btf() fi pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/') - if [ "${pahole_ver}" -lt "113" ]; then - echo >&2 "BTF: ${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.13" + if [ "${pahole_ver}" -lt "116" ]; then + echo >&2 "BTF: ${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.16" return 1 fi |