After merging net-next branch into master, Stephen asked to fix up json dump for XDP as there were some merge conflicts, so here it is.
Thanks! Daniel Borkmann (2): json: move json printer to common library bpf: properly output json for xdp include/json_print.h | 71 ++++++++++++++++ ip/Makefile | 2 +- ip/ip_common.h | 65 ++------------ ip/ip_print.c | 233 --------------------------------------------------- ip/iplink_xdp.c | 74 +++++++++------- lib/Makefile | 2 +- lib/bpf.c | 19 +++-- lib/json_print.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 369 insertions(+), 328 deletions(-) create mode 100644 include/json_print.h delete mode 100644 ip/ip_print.c create mode 100644 lib/json_print.c -- 1.9.3
