diff options
| author | David S. Miller <davem@davemloft.net> | 2016-12-17 21:27:45 -0500 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-17 21:27:45 -0500 | 
| commit | 6219d05506b66e3157efa48b1b39042b04280ce1 (patch) | |
| tree | a7804ff7b6e06cb1f7356183b1e7092bf3702e7d /net/lapb/lapb_in.c | |
| parent | 40e972ab652f3e9b84a8f24f517345b460962c29 (diff) | |
| parent | 6760bf2ddde8ad64f8205a651223a93de3a35494 (diff) | |
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>
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions
