Merge git://git.kernel.org/pub/scm/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>

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nicvf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_devlink.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_xsk.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_netdev.c
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
Simple merge

diff --cc drivers/net/ethernet/socionext/netsec.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac.h
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw_priv.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/veth.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
Simple merge

diff --cc net/bridge/br_ioctl.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/devlink.c
Simple merge

diff --cc net/core/flow_dissector.c
Simple merge

diff --cc net/dsa/dsa_priv.h
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/sched/sch_frag.c
index 5ded4c8672a64dc806b7fb755e809b2383eaab10,cd85a69820b12763b88b0045997f1dd9b34e942f..a9bd0a23589048dbbf954ce685814efea539f51a
--- 1/net/sched/sch_frag.c
--- 2/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>

diff --cc net/smc/smc_ib.c
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc tools/testing/selftests/bpf/test_verifier.c
Simple merge