]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit761bfc33dd7504de951aa7b9db27a3cc5df1fde6
tree93f4ac22fb206fe214998a599f4d2ea0214be70atree | snapshot
parent0f60a0bcc1b96d531fa623ab520f863f1292c75bcommit | diff
parent6794862a16ef41f753abd75c03a152836e4c8028commit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.