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

Cross-merge bpf fixes after downstream PR.

Trivial conflict:
tools/testing/selftests/bpf/prog_tests/verifier.c

Adjacent changes in:
Auto-merging kernel/bpf/verifier.c
Auto-merging samples/bpf/Makefile
Auto-merging tools/testing/selftests/bpf/.gitignore
Auto-merging tools/testing/selftests/bpf/Makefile
Auto-merging tools/testing/selftests/bpf/prog_tests/verifier.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

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

diff --cc samples/bpf/Makefile
Simple merge

diff --cc tools/testing/selftests/bpf/.gitignore
Simple merge

diff --cc tools/testing/selftests/bpf/Makefile
Simple merge

diff --cc tools/testing/selftests/bpf/prog_tests/verifier.c
index b1b4d69c407a7a1ebf67221a28745a1cdea24ee6,3ee40ee9413a9e0fcd09bd1b4ec4df0c06ffbd09..33cd3e0350710d2609ab697258e8de90c2be8528
--- 1/tools/testing/selftests/bpf/prog_tests/verifier.c
--- 2/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@@ -226,25 -225,7 +226,8 @@@ void test_verifier_xdp(void
  void test_verifier_xdp_direct_packet_access(void) { RUN(verifier_xdp_direct_packet_access); }
  void test_verifier_bits_iter(void) { RUN(verifier_bits_iter); }
  void test_verifier_lsm(void)                  { RUN(verifier_lsm); }
- 
- void test_verifier_mtu(void)
- {
-       __u64 caps = 0;
-       int ret;
- 
-       /* In case CAP_BPF and CAP_PERFMON is not set */
-       ret = cap_enable_effective(1ULL << CAP_BPF | 1ULL << CAP_NET_ADMIN, &caps);
-       if (!ASSERT_OK(ret, "set_cap_bpf_cap_net_admin"))
-               return;
-       ret = cap_disable_effective(1ULL << CAP_SYS_ADMIN | 1ULL << CAP_PERFMON, NULL);
-       if (!ASSERT_OK(ret, "disable_cap_sys_admin"))
-               goto restore_cap;
-       RUN(verifier_mtu);
- restore_cap:
-       if (caps)
-               cap_enable_effective(caps, NULL);
- }
 +void test_irq(void)                         { RUN(irq); }
+ void test_verifier_mtu(void)                { RUN(verifier_mtu); }
  
  static int init_test_val_map(struct bpf_object *obj, char *map_name)
  {