Merge branch 'sockmap-build-fixes'
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 Aug 2017 22:34:13 +0000 (15:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Aug 2017 22:34:13 +0000 (15:34 -0700)
commitf31126b2cdbe11c3807c80d87643c5d4b258817a
tree4757c35f412230312d7c5b36bd50add6e590224d
parentd978db8dbebb60a51492da966689dfc0c9216c44
parent6bdc9c4c31c81688e19cb186d49be01bbb6a1618
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>