From: David S. Miller <davem@davemloft.net>
Date: Thu, 17 Aug 2017 17:25:19 +0000 (-0700)
Subject: Merge branch 'bpf-smap-followups'
X-Git-Tag: v4.14-rc1~130^2~218
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=755f17a1fc6ffba2fdf3494fb9603f2a19c635d9;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

755f17a1fc6ffba2fdf3494fb9603f2a19c635d9