From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Wed, 11 Dec 2019 12:58:16 +0000 (-0300)
Subject: Merge remote-tracking branch 'torvalds/master' into perf/urgent
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=761bfc33dd7504de951aa7b9db27a3cc5df1fde6;p=openwrt%2Fstaging%2Fblogic.git

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

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>
---

761bfc33dd7504de951aa7b9db27a3cc5df1fde6