summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDaniel Borkmann <daniel@iogearbox.net>2018-02-15 12:01:06 +0300
committerDaniel Borkmann <daniel@iogearbox.net>2018-02-15 12:01:06 +0300
commit67e3a172eba577f16ceae712d835b835b9718d61 (patch)
tree90fef11760b8c33974b2027dd1e25ff5d264de52 /kernel
parent9c481b908b011398b1491752271cd1e2c9ad5758 (diff)
parent9be6d411b0c473d31f756993b8b41bb16b0679c1 (diff)
downloadlinux-67e3a172eba577f16ceae712d835b835b9718d61.tar.xz
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