]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
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>

Trivial merge