projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f60a0b 6794862)
Merge remote-tracking branch 'torvalds/master' into perf/urgent
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 11 Dec 2019 12:58:16 +0000 (09:58 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 11 Dec 2019 12:58:16 +0000 (09:58 -0300)
To pick up BPF fixes to allow a clean 'make -C tools/perf build-test':

  7c3977d1e804 libbpf: Fix sym->st_value print on 32-bit arches
  1fd450f99272 libbpf: Fix up generation of bpf_helper_defs.h

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Trivial merge
John Crispins staging tree