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/cb_refs.c

between commit:

  04ae4ffc57a6b ("selftests/bpf: Check callback map value lock identity")

from the bpf tree and commit:

  11300f54bd887 ("selftests/bpf: Refactor cb_refs selftests")

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.

(deleted the file, which probably lost the test)

Attachment: signature.asc
Description: PGP signature