From: Ian Rogers <irogers@google.com>
To: broonie@kernel.org, acme@redhat.com, namhyung@kernel.org
Cc: arnaldo.melo@gmail.com, irogers@google.com,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
linux@leemhuis.info
Subject: [PATCH v1] perf build: Fix fsmount.o build
Date: Thu, 21 May 2026 08:35:58 -0700 [thread overview]
Message-ID: <20260521153558.1421014-1-irogers@google.com> (raw)
In-Reply-To: <e08366fa-5fda-4534-8545-5d446734387f@sirena.org.uk>
A merge conflict between:
commit 552636b9317c8 ("perf trace: Add beautifier script for fsmount flags")
commit 32969ef6e3e19 ("perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase")
Resulted in a missed build dependency in the merge:
commit 61da860eee07 Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git
Fix the build by adding the necessary build dependencies.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/trace/beauty/Build | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build
index 93cde93461a3..996e63cdf765 100644
--- a/tools/perf/trace/beauty/Build
+++ b/tools/perf/trace/beauty/Build
@@ -111,6 +111,13 @@ $(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls)
$(call rule_mkdir)
$(Q)$(call echo-cmd,gen)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_dir) > $@
+fsmount_attr_arrays := $(beauty_outdir)/fsmount_attr_arrays.c
+fsmount_attr_tbls := $(srctree)/tools/perf/trace/beauty/fsmount_attr.sh
+
+$(fsmount_attr_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_attr_tbls)
+ $(call rule_mkdir)
+ $(Q)$(call echo-cmd,gen)$(SHELL) '$(fsmount_attr_tbls)' $(beauty_uapi_linux_dir) > $@
+
fspick_arrays := $(beauty_outdir)/fspick_arrays.c
fspick_tbls := $(srctree)/tools/perf/trace/beauty/fspick.sh
@@ -285,7 +292,7 @@ $(OUTPUT)trace/beauty/syscalltbl.o: $(syscall_array)
$(OUTPUT)trace/beauty/fsconfig.o: $(fsconfig_arrays)
$(OUTPUT)trace/beauty/clone.o: $(clone_flags_array)
$(OUTPUT)trace/beauty/fs_at_flags.o: $(fs_at_flags_array)
-$(OUTPUT)trace/beauty/fsmount.o: $(fsmount_arrays)
+$(OUTPUT)trace/beauty/fsmount.o: $(fsmount_arrays) $(fsmount_attr_arrays)
$(OUTPUT)trace/beauty/fspick.o: $(fspick_arrays)
$(OUTPUT)trace/beauty/ioctl.o: $(drm_ioctl_array) $(sndrv_pcm_ioctl_array) $(sndrv_ctl_ioctl_array) $(kvm_ioctl_array) $(vhost_virtio_ioctl_array) $(perf_ioctl_array) $(usbdevfs_ioctl_array)
$(OUTPUT)trace/beauty/kcmp.o: $(kcmp_type_array)
--
2.54.0.746.g67dd491aae-goog
WARNING: multiple messages have this Message-ID (diff)
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ian Rogers <irogers@google.com>
Cc: Thorsten Leemhuis <linux@leemhuis.info>,
Mark Brown <broonie@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-perf-users@vger.kernel.org
Subject: Re: [PATCH v1] perf build: Fix fsmount.o build
Date: Thu, 21 May 2026 13:49:28 -0300 [thread overview]
Message-ID: <20260521153558.1421014-1-irogers@google.com> (raw)
Message-ID: <20260521164928.jdJfXEKR_6IoLPs6LJmgT5jPorxvHrzrla7-Vzwpxu0@z> (raw)
> A merge conflict between:
> commit 552636b9317c8 ("perf trace: Add beautifier script for fsmount flags")
> commit 32969ef6e3e19 ("perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase")
> Resulted in a missed build dependency in the merge:
> commit 61da860eee07 Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git
> Fix the build by adding the necessary build dependencies.
This is not enough, after applying this I still get a conflict when
merging torvalds/master into perf-tools-next, working on it now.
And yeah, my bad, I should've test merged this before pushing out
perf-tools-next to avoid this issue.
- Arnaldo
> Signed-off-by: Ian Rogers <irogers@google.com>
> Link: https://lore.kernel.org/r/20260521153558.1421014-1-irogers@google.com
> Cc: arnaldo.melo@gmail.com
> Cc: broonie@kernel.org
> Cc: namhyung@kernel.org
> Cc: linux@leemhuis.info
> Cc: acme@redhat.com
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-next@vger.kernel.org
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
> tools/perf/trace/beauty/Build | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
> diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build
> index 93cde93461a3..996e63cdf765 100644
> --- a/tools/perf/trace/beauty/Build
> +++ b/tools/perf/trace/beauty/Build
> @@ -111,6 +111,13 @@ $(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls)
> $(call rule_mkdir)
> $(Q)$(call echo-cmd,gen)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_dir) > $@
>
>+fsmount_attr_arrays := $(beauty_outdir)/fsmount_attr_arrays.c
>+fsmount_attr_tbls := $(srctree)/tools/perf/trace/beauty/fsmount_attr.sh
>+
>+$(fsmount_attr_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_attr_tbls)
>+ $(call rule_mkdir)
>+ $(Q)$(call echo-cmd,gen)$(SHELL) '$(fsmount_attr_tbls)' $(beauty_uapi_linux_dir) > $@
>+
> fspick_arrays := $(beauty_outdir)/fspick_arrays.c
> fspick_tbls := $(srctree)/tools/perf/trace/beauty/fspick.sh
>@@ -285,7 +292,7 @@ $(OUTPUT)trace/beauty/syscalltbl.o: $(syscall_array)
> $(OUTPUT)trace/beauty/fsconfig.o: $(fsconfig_arrays)
> $(OUTPUT)trace/beauty/clone.o: $(clone_flags_array)
> $(OUTPUT)trace/beauty/fs_at_flags.o: $(fs_at_flags_array)
>-$(OUTPUT)trace/beauty/fsmount.o: $(fsmount_arrays)
>+$(OUTPUT)trace/beauty/fsmount.o: $(fsmount_arrays) $(fsmount_attr_arrays)
> $(OUTPUT)trace/beauty/fspick.o: $(fspick_arrays)
> $(OUTPUT)trace/beauty/ioctl.o: $(drm_ioctl_array) $(sndrv_pcm_ioctl_array) $(sndrv_ctl_ioctl_array) $(kvm_ioctl_array) $(vhost_virtio_ioctl_array) $(perf_ioctl_array) $(usbdevfs_ioctl_array)
> $(OUTPUT)trace/beauty/kcmp.o: $(kcmp_type_array)
--
2.54.0.746.g67dd491aae-goog
next prev parent reply other threads:[~2026-05-21 15:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-21 10:19 linux-next: manual merge of the perf tree with the origin tree Mark Brown
2026-05-21 14:55 ` Thorsten Leemhuis
2026-05-21 15:04 ` Ian Rogers
2026-05-21 15:30 ` Mark Brown
2026-05-21 15:33 ` Ian Rogers
2026-05-21 15:35 ` Ian Rogers [this message]
2026-05-21 15:58 ` [PATCH v1] perf build: Fix fsmount.o build Mark Brown
2026-05-21 16:49 ` Arnaldo Carvalho de Melo
2026-05-21 16:51 ` Namhyung Kim
2026-05-21 15:44 ` linux-next: manual merge of the perf tree with the origin tree Ian Rogers
2026-05-21 16:59 ` Namhyung Kim
2026-05-21 17:03 ` Arnaldo Carvalho de Melo
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=20260521153558.1421014-1-irogers@google.com \
--to=irogers@google.com \
--cc=acme@redhat.com \
--cc=arnaldo.melo@gmail.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@leemhuis.info \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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