Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Apr 2021 18:00:46 +0000 (11:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Apr 2021 18:00:46 +0000 (11:00 -0700)
commit29684d802e4ab484c679859217c1588c199f1d4f
tree3e62a5acb825af0ebe2c0ae208fce88b0632bc3a
parent9256ce33110174decc04caf6ef733409012e5b1c
parent6dcc4e38386950abf9060784631622dfc4df9577
Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Alexei Starovoitov says:

====================
pull-request: bpf 2021-04-01

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

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

The main changes are:

1) xsk creation fixes, from Ciara.

2) bpf_get_task_stack fix, from Dave.

3) trampoline in modules fix, from Jiri.

4) bpf_obj_get fix for links and progs, from Lorenz.

5) struct_ops progs must be gpl compatible fix, from Toke.
====================

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