From: Alexei Starovoitov <ast@kernel.org>
Date: Mon, 15 Oct 2018 23:13:15 +0000 (-0700)
Subject: Merge branch 'bpftool_sockmap'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2f1d774f7d356a7e95ac7c41373d518cf0d716c7;p=linux.git

Merge branch 'bpftool_sockmap'

John Fastabend says:

====================
The first patch adds support for attaching programs to maps. This is
needed to support sock{map|hash} use from bpftool. Currently, I carry
around custom code to do this so doing it using standard bpftool will
be great.

The second patch adds a compat mode to ignore non-zero entries in
the map def. This allows using bpftool with maps that have a extra
fields that the user knows can be ignored. This is needed to work
correctly with maps being loaded by other tools or directly via
syscalls.

v3: add bash completion and doc updates for --mapcompat
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

2f1d774f7d356a7e95ac7c41373d518cf0d716c7