From: David S. Miller <davem@davemloft.net>
Date: Tue, 15 Jun 2021 22:26:07 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Tag: microblaze-v5.15~229^2~28
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=a4f0377db1254373513b992ff31a351a7111f0fd;p=linux-2.6-microblaze.git

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

Daniel Borkmann says:

====================
pull-request: bpf 2021-06-15

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

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

The main changes are:

1) Fix marking incorrect umem ring as done in libbpf's
   xsk_socket__create_shared() helper, from Kev Jackson.

2) Fix oob leakage under a spectre v1 type confusion
   attack, from Daniel Borkmann.
====================

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

a4f0377db1254373513b992ff31a351a7111f0fd