]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'bpf-bpftool-misc-fixes'
authorDaniel Borkmann <daniel@iogearbox.net>
Thu, 4 Jan 2018 11:28:47 +0000 (12:28 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 4 Jan 2018 11:28:47 +0000 (12:28 +0100)
commit96f20e768a64710e69a98acf565586a7e487f06d
tree7ad59b3c1ad348e95e1daab86b444eb0968bbff6
parent5eb6c72b221110ed03de9a048e9e7bdde44ef433
parentb9fe45fdc386327ae727349e0b6844c76d3ebe1c
Merge branch 'bpf-bpftool-misc-fixes'

Jakub Kicinski says:

====================
This series addresses small issues that snuck through the review
of cgroup code.  "list" and "show" are now made aliases to satisfy
all users.  Small fix to errors printed is needed, errors can't
contain new line characters, otherwise JSON will break.
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>