From: Alexei Starovoitov <ast@kernel.org>
Date: Wed, 8 Aug 2018 19:06:18 +0000 (-0700)
Subject: Merge branch 'sockmap-fixes'
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bf9bae0ea6ec7013ef37b19fbbf29b62a35474fb;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'sockmap-fixes'

Daniel Borkmann says:

====================
Two sockmap fixes in bpf_tcp_sendmsg(), and one fix for the
sockmap kernel selftest. Thanks!
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

bf9bae0ea6ec7013ef37b19fbbf29b62a35474fb