diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-12-11 09:58:16 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-12-11 09:58:16 -0300 |
commit | 761bfc33dd7504de951aa7b9db27a3cc5df1fde6 (patch) | |
tree | 93f4ac22fb206fe214998a599f4d2ea0214be70a /kernel/kexec.c | |
parent | 0f60a0bcc1b96d531fa623ab520f863f1292c75b (diff) | |
parent | 6794862a16ef41f753abd75c03a152836e4c8028 (diff) | |
download | linux-761bfc33dd7504de951aa7b9db27a3cc5df1fde6.tar.gz linux-761bfc33dd7504de951aa7b9db27a3cc5df1fde6.tar.bz2 linux-761bfc33dd7504de951aa7b9db27a3cc5df1fde6.zip |
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>
Diffstat (limited to 'kernel/kexec.c')
0 files changed, 0 insertions, 0 deletions