From: Michael Ellerman <mpe@ellerman•id.au>
To: Arnaldo Carvalho de Melo <acme@kernel•org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnaldo Carvalho de Melo <arnaldo.melo@gmail•com>,
kajoljain <kjain@linux•ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the perf tree
Date: Fri, 14 Jan 2022 23:03:32 +1100 [thread overview]
Message-ID: <87r19a1q3v.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <Yd3+M+efH6bTEpP9@kernel.org>
Arnaldo Carvalho de Melo <acme@kernel•org> writes:
> Em Wed, Jan 12, 2022 at 08:45:53AM +1100, Stephen Rothwell escreveu:
>> Hi all,
>>
>> On Fri, 7 Jan 2022 14:28:37 +0530 kajoljain <kjain@linux•ibm.com> wrote:
>> >
>> > On 1/6/22 3:49 AM, Stephen Rothwell wrote:
>> > >
>> > > After merging the perf tree, today's linux-next build (powerpc
>> > > ppc64_defconfig) failed like this:
>> > >
>> > > In file included from include/linux/perf_event.h:17,
>> > > from arch/powerpc/perf/isa207-common.h:12,
>> > > from arch/powerpc/perf/isa207-common.c:9:
>> > > arch/powerpc/perf/isa207-common.c: In function 'isa207_find_source':
>> > > include/uapi/linux/perf_event.h:1339:11: error: 'PERF_MEM_HOPS_2' undeclared (first use in this function); did you mean 'PERF_MEM_HOPS_0'?
>> > > 1339 | (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
>> > > | ^~~~~~~~~
>> > > arch/powerpc/perf/isa207-common.h:273:20: note: in expansion of macro 'PERF_MEM_S'
>> > > 273 | #define P(a, b) PERF_MEM_S(a, b)
>> > > | ^~~~~~~~~~
>> > > arch/powerpc/perf/isa207-common.c:240:51: note: in expansion of macro 'P'
>> > > 240 | ret |= PH(LVL, REM_RAM1) | REM | LEVEL(RAM) | P(HOPS, 2);
>> > > | ^
>> > > include/uapi/linux/perf_event.h:1339:11: note: each undeclared identifier is reported only once for each function it appears in
>> > > 1339 | (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
>> > > | ^~~~~~~~~
>> > > arch/powerpc/perf/isa207-common.h:273:20: note: in expansion of macro 'PERF_MEM_S'
>> > > 273 | #define P(a, b) PERF_MEM_S(a, b)
>> > > | ^~~~~~~~~~
>> > > arch/powerpc/perf/isa207-common.c:240:51: note: in expansion of macro 'P'
>> > > 240 | ret |= PH(LVL, REM_RAM1) | REM | LEVEL(RAM) | P(HOPS, 2);
>> > > | ^
>> > > include/uapi/linux/perf_event.h:1339:11: error: 'PERF_MEM_HOPS_3' undeclared (first use in this function); did you mean 'PERF_MEM_HOPS_0'?
>> > > 1339 | (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
>> > > | ^~~~~~~~~
>> > > arch/powerpc/perf/isa207-common.h:273:20: note: in expansion of macro 'PERF_MEM_S'
>> > > 273 | #define P(a, b) PERF_MEM_S(a, b)
>> > > | ^~~~~~~~~~
>> > > arch/powerpc/perf/isa207-common.c:244:51: note: in expansion of macro 'P'
>> > > 244 | ret |= PH(LVL, REM_RAM2) | REM | LEVEL(RAM) | P(HOPS, 3);
>> > > | ^
>> > >
>> > > Caused by commit
>> > >
>> > > af2b24f228a0 ("perf powerpc: Add data source encodings for power10 platform")
>> > >
>> > > It looks like patch 1/4 of this series is missing ...
>> >
>> > Hi Stephen,
>> > Yes you are right, original patch series contain 4 patches, where
>> > 1/4 patch contain kernel side changes for the same. Hence we are getting
>> > this error, as that patch is missing in the Arnaldo tree.
>> >
>> > Link to the patchset: https://lkml.org/lkml/2021/12/6/143
>> >
>> > That kernel side patch is taken by Michael Ellermen via powerpc git.
>> >
>> > Link to the patchset on powerpc/next:
>> >
>> > [1/4] perf: Add new macros for mem_hops field
>> > https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id=cb1c4aba055f928ffae0c868e8dfe08eeab302e7
>> >
>> >
>> > [3/4] powerpc/perf: Add encodings to represent data based on newer
>> > composite PERF_MEM_LVLNUM* fields
>> > https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id=4a20ee106154ac1765dea97932faad29f0ba57fc
>> >
>> > [4/4] powerpc/perf: Add data source encodings for power10 platform
>> > https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id=6ed05a8efda56e5be11081954929421de19cce88
>> >
>> > Thanks,
>> > Kajol Jain
>> >
>> > >
>> > > I have used the perf tree from next-20220105 for today.
>> > >
>>
>> I am still getting this build failure.
>
> Yeah, this patch shouldn't have been merged thru the perf _tools_ tree,
> my bad, it should have gone thru Michael PPC kernel tree.
>
> It was a single series mixing up tools/ with kernel bits, I thought I
> had picked just the tools part but made a mistake.
>
> This should get resolved when the rest of the kernel bits go via
> Michael's powerpc tree, right?
Sorry about this.
I've just sent my pull request to Linus.
cheers
next prev parent reply other threads:[~2022-01-14 12:03 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 22:19 linux-next: build failure after merge of the perf tree Stephen Rothwell
2022-01-07 8:58 ` kajoljain
2022-01-11 21:45 ` Stephen Rothwell
2022-01-11 22:01 ` Arnaldo Carvalho de Melo
2022-01-12 5:30 ` kajoljain
2022-01-12 6:16 ` Stephen Rothwell
2022-01-14 12:03 ` Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-20 23:05 Stephen Rothwell
2022-07-21 2:35 ` Ian Rogers
2022-07-21 3:55 ` Stephen Rothwell
2022-07-21 5:33 ` Ian Rogers
2022-08-30 22:34 Stephen Rothwell
2022-09-01 5:11 ` Anshuman Khandual
2022-09-06 19:05 ` Stephen Rothwell
2022-09-07 2:31 ` Anshuman Khandual
2022-09-07 3:00 ` Stephen Rothwell
2022-09-07 4:22 ` Anshuman Khandual
2022-09-08 15:21 ` Arnaldo Carvalho de Melo
2023-03-16 22:50 Stephen Rothwell
2023-03-16 23:11 ` Arnaldo Carvalho de Melo
2023-03-16 23:55 ` Stephen Rothwell
2023-03-17 3:23 ` Ian Rogers
2023-03-21 21:39 ` Stephen Rothwell
2023-03-22 18:37 ` Ian Rogers
2023-03-22 22:54 ` Stephen Rothwell
2023-03-23 13:27 ` Arnaldo Carvalho de Melo
2023-03-27 20:31 ` Ian Rogers
2023-03-28 1:33 ` Stephen Rothwell
2023-03-28 19:47 ` Arnaldo Carvalho de Melo
2023-03-28 23:06 ` Stephen Rothwell
2023-03-29 12:28 ` Arnaldo Carvalho de Melo
2023-04-03 5:15 ` Stephen Rothwell
2023-05-29 23:05 Stephen Rothwell
2023-05-30 2:16 ` Ian Rogers
2023-10-24 23:26 Stephen Rothwell
2023-10-25 0:34 ` Namhyung Kim
2024-02-06 23:40 Stephen Rothwell
2024-02-07 0:02 ` Ian Rogers
2024-02-21 23:06 Stephen Rothwell
2024-02-23 19:50 ` Arnaldo Carvalho de Melo
2024-03-21 21:41 Stephen Rothwell
2024-03-21 23:18 ` Arnaldo Carvalho de Melo
2024-03-21 23:19 ` Arnaldo Carvalho de Melo
2024-03-21 23:32 ` Stephen Rothwell
2024-03-22 2:13 ` Stephen Rothwell
2024-03-22 14:32 ` Arnaldo Carvalho de Melo
2024-03-21 23:36 ` Stephen Rothwell
2024-03-21 23:40 ` arnaldo.melo
2024-03-21 23:48 ` Arnaldo Carvalho de Melo
2024-04-01 22:41 Stephen Rothwell
2024-04-02 20:17 ` Arnaldo Carvalho de Melo
2024-04-12 15:22 ` Arnaldo Carvalho de Melo
2024-04-13 2:43 ` Stephen Rothwell
2024-09-05 1:55 Stephen Rothwell
2024-10-10 23:23 Stephen Rothwell
2025-01-09 23:05 Stephen Rothwell
2025-01-09 23:31 ` Charlie Jenkins
2025-01-10 14:01 ` Arnaldo Carvalho de Melo
2025-01-10 17:32 ` Arnaldo Carvalho de Melo
2025-01-10 18:59 ` Charlie Jenkins
2025-01-10 19:22 ` Charlie Jenkins
2025-02-14 4:20 Stephen Rothwell
2025-03-26 23:22 Stephen Rothwell
2025-03-28 6:40 ` Namhyung Kim
2026-01-19 16:09 Mark Brown
2026-01-19 16:37 ` James Clark
2026-01-19 16:43 ` Mark Brown
2026-01-19 16:55 ` James Clark
2026-01-19 17:02 ` Mark Brown
2026-01-26 15:13 ` Mark Brown
2026-01-26 15:20 ` James Clark
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r19a1q3v.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=acme@kernel$(echo .)org \
--cc=arnaldo.melo@gmail$(echo .)com \
--cc=kjain@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox