From: David S. Miller <davem@davemloft.net>
Date: Fri, 31 Dec 2021 14:35:40 +0000 (+0000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
X-Git-Tag: block-5.17-2022-01-21~91^2~92
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e63a02348958;p=linux-block.git

Merge git://git./linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

====================
pull-request: bpf-next 2021-12-30

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

We've added 72 non-merge commits during the last 20 day(s) which contain
a total of 223 files changed, 3510 insertions(+), 1591 deletions(-).

The main changes are:

1) Automatic setrlimit in libbpf when bpf is memcg's in the kernel, from Andrii.

2) Beautify and de-verbose verifier logs, from Christy.

3) Composable verifier types, from Hao.

4) bpf_strncmp helper, from Hou.

5) bpf.h header dependency cleanup, from Jakub.

6) get_func_[arg|ret|arg_cnt] helpers, from Jiri.

7) Sleepable local storage, from KP.

8) Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument support, from Kumar.
====================

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

e63a02348958cd7cc8c8401c94de57ad97b5d06c
diff --cc net/sched/sch_frag.c
index 5ded4c8672a6,cd85a69820b1..a9bd0a235890
--- a/net/sched/sch_frag.c
+++ b/net/sched/sch_frag.c
@@@ -1,7 -1,7 +1,8 @@@
  // SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
+ #include <linux/if_vlan.h>
  #include <net/netlink.h>
  #include <net/sch_generic.h>
 +#include <net/pkt_sched.h>
  #include <net/dst.h>
  #include <net/ip.h>
  #include <net/ip6_fib.h>