tree 011745b348dfea74709648487aed31bb6f670329
parent 1d6119baf0610f813eb9d9580eb4fd16de5b4ceb
parent 42984d7c1e563bf92e6ca7a0fd89f8e933f2162e
author David S. Miller <davem@davemloft.net> 1446522519 -0500
committer David S. Miller <davem@davemloft.net> 1446522519 -0500

Merge branch 'bpf-persistent'

Daniel Borkmann says:

====================
BPF updates

This set adds support for persistent maps/progs. Please see
individual patches for further details. A man-page update
to bpf(2) will be sent later on, also a iproute2 patch for
support in tc.

v1 -> v2:
  - Reworked most of patch 4 and 5
  - Rebased to latest net-next
====================

Signed-off-by: David S. Miller <davem@davemloft.net>