From: David S. Miller <davem@davemloft.net>
Date: Thu, 28 Dec 2017 01:35:03 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Tag: v4.15-rc6~21^2~3
X-Git-Url: http://git.agner.ch/gitweb/?a=commitdiff_plain;h=1528f6e2764c483b9ba1df315d771b2d41b11a04;p=linux.git

Merge git://git./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>
---

1528f6e2764c483b9ba1df315d771b2d41b11a04