OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2020 22:53:08 +0000 (15:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2020 22:53:08 +0000 (15:53 -0700)
commit9a25c1df24a6fea9dc79eec950453c4e00f707fd
tree1188078f9838a3b6a60a3923ed31df142ffc8ed6
parentefd7ed0f5f2d07ccbb1853c5d46656cdfa1371fb
parentcf51abcded837ef209faa03a62b2ea44e45995e8
Merge git://git./linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

====================
pull-request: bpf-next 2020-06-01

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

We've added 55 non-merge commits during the last 1 day(s) which contain
a total of 91 files changed, 4986 insertions(+), 463 deletions(-).

The main changes are:

1) Add rx_queue_mapping to bpf_sock from Amritha.

2) Add BPF ring buffer, from Andrii.

3) Attach and run programs through devmap, from David.

4) Allow SO_BINDTODEVICE opt in bpf_setsockopt, from Ferenc.

5) link based flow_dissector, from Jakub.

6) Use tracing helpers for lsm programs, from Jiri.

7) Several sk_msg fixes and extensions, from John.
====================

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