From: Daniel Borkmann Date: Thu, 15 Feb 2018 09:01:06 +0000 (+0100) Subject: Merge branch 'bpf-bpftool-json-fixes' X-Git-Tag: ceph-for-4.16-rc4~12^2~15^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67e3a172eba577f16ceae712d835b835b9718d61;p=ceph-client.git 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 --- 67e3a172eba577f16ceae712d835b835b9718d61