From: David S. Miller <davem@davemloft.net>
Date: Fri, 13 Mar 2020 18:13:45 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Tag: v5.6~21^2~66
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=242a6df688dcad7c55105280a79aaff83addf7ce;p=users%2Fhch%2Fdma-mapping.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Alexei Starovoitov says:

====================
pull-request: bpf 2020-03-12

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

We've added 12 non-merge commits during the last 8 day(s) which contain
a total of 12 files changed, 161 insertions(+), 15 deletions(-).

The main changes are:

1) Andrii fixed two bugs in cgroup-bpf.

2) John fixed sockmap.

3) Luke fixed x32 jit.

4) Martin fixed two issues in struct_ops.

5) Yonghong fixed bpf_send_signal.

6) Yoshiki fixed BTF enum.
====================

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

242a6df688dcad7c55105280a79aaff83addf7ce