Commit 761bfc33 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/urgent

To pick up BPF fixes to allow a clean 'make -C tools/perf build-test':

  7c3977d1 libbpf: Fix sym->st_value print on 32-bit arches
  1fd450f9

 libbpf: Fix up generation of bpf_helper_defs.h

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 0f60a0bc 6794862a
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment