Hi all,
On Tue, 16 May 2023 10:34:13 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the tip tree got conflicts in:
>
> tools/perf/arch/x86/include/arch-tests.h
> tools/perf/arch/x86/tests/arch-tests.c
>
> between commit:
>
> ae4aa00a1a93 ("perf test: Move x86 hybrid tests to arch/x86")
>
> from the perf tree and commit:
>
> 78075d947534 ("perf test: Add selftest to test IBS invocation via core pmu events")
>
> from the tip 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc tools/perf/arch/x86/include/arch-tests.h
> index 33d39c1d3e64,93d3b8877baa..000000000000
> --- a/tools/perf/arch/x86/include/arch-tests.h
> +++ b/tools/perf/arch/x86/include/arch-tests.h
> @@@ -11,7 -11,7 +11,8 @@@ int test__intel_pt_pkt_decoder(struct t
> int test__intel_pt_hybrid_compat(struct test_suite *test, int subtest);
> int test__bp_modify(struct test_suite *test, int subtest);
> int test__x86_sample_parsing(struct test_suite *test, int subtest);
> +int test__hybrid(struct test_suite *test, int subtest);
> + int test__amd_ibs_via_core_pmu(struct test_suite *test, int subtest);
>
> extern struct test_suite *arch_tests[];
>
> diff --cc tools/perf/arch/x86/tests/arch-tests.c
> index 147ad0638bbb,b5c85ab8d92e..000000000000
> --- a/tools/perf/arch/x86/tests/arch-tests.c
> +++ b/tools/perf/arch/x86/tests/arch-tests.c
> @@@ -22,15 -22,7 +22,16 @@@ struct test_suite suite__intel_pt =
> DEFINE_SUITE("x86 bp modify", bp_modify);
> #endif
> DEFINE_SUITE("x86 Sample parsing", x86_sample_parsing);
> +static struct test_case hybrid_tests[] = {
> + TEST_CASE_REASON("x86 hybrid event parsing", hybrid, "not hybrid"),
> + { .name = NULL, }
> +};
> +
> +struct test_suite suite__hybrid = {
> + .desc = "x86 hybrid",
> + .test_cases = hybrid_tests,
> +};
> + DEFINE_SUITE("AMD IBS via core pmu", amd_ibs_via_core_pmu);
>
> struct test_suite *arch_tests[] = {
> #ifdef HAVE_DWARF_UNWIND_SUPPORT
> @@@ -44,6 -36,6 +45,7 @@@
> &suite__bp_modify,
> #endif
> &suite__x86_sample_parsing,
> + &suite__hybrid,
> + &suite__amd_ibs_via_core_pmu,
> NULL,
> };
This is now a conflict between the perf tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpnOq5JXJz0E.pgp
Description: OpenPGP digital signature
