From: David S. Miller <davem@davemloft.net>
Date: Sun, 18 Dec 2016 02:27:45 +0000 (-0500)
Subject: Merge branch 'bpf-fixes'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6219d05506b66e3157efa48b1b39042b04280ce1;p=linux-beck.git

Merge branch 'bpf-fixes'

Daniel Borkmann says:

====================
Couple of BPF fixes

This set contains three BPF fixes for net, one that addresses the
complaint from Geert wrt static allocations, and the other is a fix
wrt mem accounting that I found recently during testing and there's
still one more fix on the map value marking.

Thanks!

v1 -> v2:
  - Patch 1 as is.
  - Fixed kbuild bot issue by letting charging helpers stay in the
    syscall.c, since there locked_vm is valid and only export the
    ones needed by bpf_prog_realloc(). Add empty stubs in case the
    bpf syscall is not enabled.
  - Added patch 3 that addresses one more issue in map val marking.
====================

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

6219d05506b66e3157efa48b1b39042b04280ce1