From: David S. Miller <davem@davemloft.net>
Date: Wed, 16 Aug 2017 22:34:13 +0000 (-0700)
Subject: Merge branch 'sockmap-build-fixes'
X-Git-Tag: v4.14-rc1~130^2~227
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f31126b2cdbe11c3807c80d87643c5d4b258817a;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branch 'sockmap-build-fixes'

John Fastabend says:

====================
bpf: sockmap build fixes

Two build fixes for sockmap, this should resolve the build errors
and warnings that were reported. Thanks everyone.
====================

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

f31126b2cdbe11c3807c80d87643c5d4b258817a