diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-27 20:35:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-27 20:35:03 -0500 |
| commit | 1528f6e2764c483b9ba1df315d771b2d41b11a04 (patch) | |
| tree | 441d2e261c38b04f54ef4db986a58ee74748fa8c /net/tipc/socket.c | |
| parent | sctp: Replace use of sockets_allocated with specified macro. (diff) | |
| parent | Merge branch 'bpf-bpftool-various-fixes' (diff) | |
| download | linux-dev-1528f6e2764c483b9ba1df315d771b2d41b11a04.tar.xz linux-dev-1528f6e2764c483b9ba1df315d771b2d41b11a04.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2017-12-28
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Two small fixes for bpftool. Fix otherwise broken output if any of
the system calls failed when listing maps in json format and instead
of bailing out, skip maps or progs that disappeared between fetching
next id and getting an fd for that id, both from Jakub.
2) Small fix in BPF selftests to respect LLC passed from command line
when testing for -mcpu=probe presence, from Quentin.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions