Merge branch 'btf-fixes'
authorAlexei Starovoitov <ast@kernel.org>
Sat, 2 Jun 2018 18:22:37 +0000 (11:22 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 2 Jun 2018 18:22:37 +0000 (11:22 -0700)
Martin KaFai Lau says:

====================
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

Trivial merge