diff options
author | Daniel Borkmann <daniel@iogearbox.net> | 2018-02-15 10:01:06 +0100 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-02-15 10:01:06 +0100 |
commit | 67e3a172eba577f16ceae712d835b835b9718d61 (patch) | |
tree | 90fef11760b8c33974b2027dd1e25ff5d264de52 /kernel | |
parent | 9c481b908b011398b1491752271cd1e2c9ad5758 (diff) | |
parent | 9be6d411b0c473d31f756993b8b41bb16b0679c1 (diff) | |
download | linux-stable-67e3a172eba577f16ceae712d835b835b9718d61.tar.gz linux-stable-67e3a172eba577f16ceae712d835b835b9718d61.tar.bz2 linux-stable-67e3a172eba577f16ceae712d835b835b9718d61.zip |
Merge branch 'bpf-bpftool-json-fixes'
Quentin Monnet says:
====================
These are two minor fixes to avoid breaking JSON output in batch mode. The
first one makes bpftool output a "null" JSON object, as expected in batch
mode if nothing else is to be printed, when dumping program instructions
into an output file. The second one replaces a call to "perror()" with
something that does not break JSON when parsing input file for batch mode.
====================
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions