OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Sep 2018 17:08:45 +0000 (10:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Sep 2018 17:08:45 +0000 (10:08 -0700)
commitd2f85c9e1cf8ecdccae3e44fb2c4a36b1bbc4cb7
tree1616476f981ae7870a552f38ee429307379954a8
parentd26ed6b0e5e23190d43ab34bc69cbecdc464a2cf
parentfad0c40fab14523ca381a30fef88b7c3266bef1c
Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2018-09-24

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Several fixes for BPF sockmap to only allow sockets being attached in
   ESTABLISHED state, from John.

2) Fix up the license to LGPL/BSD for the libc compat header which contains
   fallback helpers that libbpf and bpftool is using, from Jakub.
====================

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