Message ID | 20230516103413.21e34bb6@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp81523vqo; Mon, 15 May 2023 17:52:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6TxnYUnR7J3dQvjdXl3NCOF9yHJOCObzqAoocFVsZ/rCObAwaRTPIpG8IGgh8JLFVfgyCj X-Received: by 2002:a17:90a:c306:b0:250:c118:cb4f with SMTP id g6-20020a17090ac30600b00250c118cb4fmr21154210pjt.34.1684198353783; Mon, 15 May 2023 17:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684198353; cv=none; d=google.com; s=arc-20160816; b=mgUM5gFsN1DUUYPIS5EJxMQlk5P5AaisxE3ExLc8F+iu4+FrYh5xeQ5qb0hq2NMo8y YIfvoIqQ7BjYisOTi3/62ZCSg2GF71gfFdNYc3by6UIYSe05jzDTUbzfdBDfv/tQPvtb FCX3XBRjH5ysLX8hvD0yn/Ze+aCRvWhdZFLnA9wywMZhUJkfAOf8QN27RGSel26oc1w5 4s1x1TIYwRSua6OovTQLFv697aOcD9Es4K1pMozRkWi113whWIrbyrvsvcDUxYR+NF5j CKVYhna6uUdsncSdfMWEfoxG7yYq9wVuYIAcm/tHohgjsYcASybuWrDnhfnyOxjeae0i gmJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=jJKZfJCxepyKL6BZvZjgIYbio3EXugpuplEPBrwz7/Y=; b=ADbHKkB3phAz6RYet66w4Cad1Cyaeu+YHNUy4mXFHZL9RpM7UbuaSLAtfsVK7NWJ/r pku98YBdAISkw6FQjequ1Ehcy5jh714Y856atvY0CbtXXYIftcrlM9S2YUH53JpxulQP Xk+PwyqKJh9oVRC9WR8YFqN7a0DKTQGpDkWJ+bJfbDqbXZ8dHUfadUfdxR4uZas+YCLW GRoval9MBqyEUr+ZCDDLx09q7PwBVDYycUjddlLLijg2JI6MnZnp6g6eu86FwaZrIB9e iCPordzpVxuacvTW/D5zZC/+KZCf3XsKVdwlCqxah7ya6gOKiEZsdzUBC0WT8oLO6zU1 jDvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WWO0CnVk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mu6-20020a17090b388600b0024de98a941esi540084pjb.189.2023.05.15.17.52.21; Mon, 15 May 2023 17:52:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WWO0CnVk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245661AbjEPAeW (ORCPT <rfc822;peekingduck44@gmail.com> + 99 others); Mon, 15 May 2023 20:34:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231416AbjEPAeU (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 15 May 2023 20:34:20 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC9E883E2; Mon, 15 May 2023 17:34:17 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QKy0l0Rgnz4x1f; Tue, 16 May 2023 10:34:15 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1684197256; bh=jJKZfJCxepyKL6BZvZjgIYbio3EXugpuplEPBrwz7/Y=; h=Date:From:To:Cc:Subject:From; b=WWO0CnVk0k6VJayG5o4Sv3TbIU/5ZXEQQzJSavQX2T7EmQlR3lcDOy0ymGMIp918O wc1oK56AvvO4UHxn5e4SrQaT1tDy7Lo2DmhLigXzt5tPfMWgBsAi2WLcl8i6OPz9gX 74iFmCpmQVi0wWI5nI/+vjTEbV9iFErdh030Uj5Y1BmwelK45jz5KYS3KAsDOpBnVw HTyJMWaM/iE7lDhdbd6rVRlQdqET9ZMPzhAz1o9hlCSI/dNslZL6OiHsYSZvtqd6/R 8z2Ar/7T0eyjHMFLModSI7+st1BjQFtnC0kNP5n67eORsEtPoio219A8nL2eQothrT HtVaPJDgTVhPQ== Date: Tue, 16 May 2023 10:34:13 +1000 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>, Ian Rogers <irogers@google.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Ravi Bangoria <ravi.bangoria@amd.com> Subject: linux-next: manual merge of the tip tree with the perf tree Message-ID: <20230516103413.21e34bb6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/9XmPjZAkgv_9cK5=I92F2ve"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766009972706032758?= X-GMAIL-MSGID: =?utf-8?q?1766009972706032758?= |
Series |
linux-next: manual merge of the tip tree with the perf tree
|
|
Commit Message
Stephen Rothwell
May 16, 2023, 12:34 a.m. UTC
Hi all, 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.
Comments
Hi all, On Tue, 16 May 2023 10:34:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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.
Hello, On Tue, Jun 27, 2023 at 6:37 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > On Tue, 16 May 2023 10:34:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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. Thanks for the email and the resolution. Looks ok to me. I'll note this in my pull request. > > > > -- > > 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. Yep, thanks! Namhyung
diff --cc tools/perf/arch/x86/include/arch-tests.h index 33d39c1d3e64,93d3b8877baa..000000000000 --- a/tools/perf/arch/x86/include/arch-tests.h diff --cc tools/perf/arch/x86/tests/arch-tests.c index 147ad0638bbb,b5c85ab8d92e..000000000000 --- a/tools/perf/arch/x86/tests/arch-tests.c