linux-next: manual merge of the bpf-next tree with the bpf tree

[Mark Brown]

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  tools/testing/selftests/bpf/prog_tests/verifier.c

between commit:

  a903f145a8914 ("selftests/bpf: Add tests for the KF_PERFMON gates")

from the bpf tree and commit:

  5647b77587ce1 ("selftests/bpf: Test kfunc packet memory direct writes")

from the bpf-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc tools/testing/selftests/bpf/prog_tests/verifier.c
index 8b439e194bcc5,7732df9bc8701..0000000000000
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@@ -54,7 -55,7 +56,8 @@@
  #include "verifier_iterating_callbacks.skel.h"
  #include "verifier_jeq_infer_not_null.skel.h"
  #include "verifier_jit_convergence.skel.h"
+ #include "verifier_kfunc_packet_access.skel.h"
 +#include "verifier_kfunc_perfmon.skel.h"
  #include "verifier_ld_ind.skel.h"
  #include "verifier_ldsx.skel.h"
  #include "verifier_leak_ptr.skel.h"
@@@ -219,7 -221,7 +224,8 @@@ void test_verifier_int_ptr(void
  void test_verifier_iterating_callbacks(void)  { RUN(verifier_iterating_callbacks); }
  void test_verifier_jeq_infer_not_null(void)   { RUN(verifier_jeq_infer_not_null); }
  void test_verifier_jit_convergence(void)      { RUN(verifier_jit_convergence); }
+ void test_verifier_kfunc_packet_access(void)  { RUN_TESTS(verifier_kfunc_packet_access); }
 +void test_verifier_kfunc_perfmon(void)        { RUN(verifier_kfunc_perfmon); }
  void test_verifier_load_acquire(void)         { RUN(verifier_load_acquire); }
  void test_verifier_ld_ind(void)               { RUN(verifier_ld_ind); }
  void test_verifier_ldsx(void)                  { RUN(verifier_ldsx); }

Attachment: signature.asc
Description: PGP signature