Merge branch 'bpf-smap-followups'
authorDavid S. Miller <davem@davemloft.net>
Thu, 17 Aug 2017 17:25:19 +0000 (10:25 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 Aug 2017 17:25:19 +0000 (10:25 -0700)
commit755f17a1fc6ffba2fdf3494fb9603f2a19c635d9
treefac249e34e4080b24edcacba128b5ae4a5a0cdd3
parent8c37bc677af3458dd5598d22467fb913f31c5bb2
parent047b0ecd683045dcea371f9d4d2917dcf3c553da
Merge branch 'bpf-smap-followups'

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>