Hi,

Please include commit  be80e9cdbca8 ("libbpf: Rename DECLARE_LIBBPF_OPTS into LIBBPF_OPTS") to the 5.15 stable branch.

Commit  3eefb2fbf4ec ("selftests/bpf: Test tail call counting with bpf2bpf and data on stack") introduced in v5.15.39 is dependent on it, and now building selftests fails with:

... linux/tools/testing/selftests/bpf/prog_tests/tailcalls.c: In function ‘test_tailcall_bpf2bpf_6’: linux/tools/testing/selftests/bpf/prog_tests/tailcalls.c:822:9: warning: implicit declaration of function ‘LIBBPF_OPTS’; did you mean ‘LIBBPF_API’? [-Wimplicit-function-declaration]     822 | LIBBPF_OPTS(bpf_test_run_opts, topts,         | ^~~~~~~~~~~         | LIBBPF_API linux/tools/testing/selftests/bpf/prog_tests/tailcalls.c:822:21: error: ‘bpf_test_run_opts’ undeclared (first use in this function)     822 | LIBBPF_OPTS(bpf_test_run_opts, topts,         | ^~~~~~~~~~~~~~~~~ linux/tools/testing/selftests/bpf/prog_tests/tailcalls.c:822:21: note: each undeclared identifier is reported only once for each function it appears in   linux/tools/testing/selftests/bpf/prog_tests/tailcalls.c:822:40: error: ‘topts’ undeclared (first use in this function)     822 | LIBBPF_OPTS(bpf_test_run_opts, topts,         | ^~~~~   tools/testing/selftests/bpf/prog_tests/tailcalls.c:823:17: error: expected expression before ‘.’ token     823 | .data_in = &pkt_v4,         | ^ ...

Thanks in advance, Roxana