Merge branch 'bpf-smap-followups'

Browse source

Daniel Borkmann says:

====================
Two BPF smap related followups

Fixing preemption imbalance and consolidating prologue
generation. Thanks!
====================

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

...

This commit is contained in:

David S. Miller 2017-08-17 10:25:19 -07:00

parent 8c37bc677a 047b0ecd68

commit 755f17a1fc

2 changed files with 12 additions and 38 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

kernel/bpf/sockmap.c

View file

47

net/core/filter.c

View file