Merge branch 'sockmap-fixes'
authorAlexei Starovoitov <ast@kernel.org>
Wed, 8 Aug 2018 19:06:18 +0000 (12:06 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Wed, 8 Aug 2018 19:06:18 +0000 (12:06 -0700)
commitbf9bae0ea6ec7013ef37b19fbbf29b62a35474fb
treef9f065f65726c9f51b21051ea0c003fbaac5706d
parent74682128c6e456b529b25b95ba807484ce58a753
parent3c6ed988fd8b66eec8e5ab2b624818865d2712ca
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>