From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F5A63672A1 for ; Thu, 21 May 2026 15:36:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779377767; cv=none; b=C6ULiH27AoE6NlXDXiD/BfgSQX10YgcSe8fVVcfQVot7CpDbtu+rYuZqaRJ8WcbKdR+eXe4sN/bQXg0LsAo8i/fDbn2HTeXX5Lss6AgsWx5T014isVyPtRW+BovvC/j+xGlS5alNDES5KwClG2PKNU0ejbS1QhsO54dK3b66xtg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779377767; c=relaxed/simple; bh=lizNbU7OWSW9NlsSvJz9oHLsQkWJ9gEWq/P+rFpk/LM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=V2j+JgCvign0/6lkyMcLv4ARilfiLv65cKICxpwdDtFVpLwbtXgi1oijQxXu9J1ZeUx1OVHFL2RClknz9Nrw3+Mi+z6wmIPJ/W6p6HzN1NCdcHcr3QJ66w6tlbHWXCHYvs1J4/xWcoJlKOxxfdAoHi51mpuoBkIa6gLoBop4EVk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=J1WJR0nE; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="J1WJR0nE" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2fe1cf409a1so10542961eec.1 for ; Thu, 21 May 2026 08:36:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779377763; x=1779982563; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=F6lGaJSDIBqmMkdwp201XEsBA66WNIUlgHDJIOs3gpA=; b=J1WJR0nErBOSVQSzuEp2EIMCRlKvpsUeaCgL2P8rk9vV3kGDnNTUwHlEyUpuJOxnrt Bt6EoFt9NUhET5i4s3OrZjQSqCJJMDM5XU4NZsqQYEHMcvg+bayODOvnmWs9AN9ggvJt +EsVe32bPcQKg99FJqWPYKId0kXkcgHUT5j7eMxJEC9lpnLh5S9nYzGCUmdFir+R2TJ+ 8VnbO+AGv9nUmdWRlF19tqRZVphkYeZwnFKcc/1Fe8Je4QcKL/bxrCXRbIlQj0cNr546 akLcu8PQpXfc3+KsGbj9UjMBxiaeBhbFPM3xDP2kfXFfC48RrNjPRels6UeiwW+FQu7n oaSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779377763; x=1779982563; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=F6lGaJSDIBqmMkdwp201XEsBA66WNIUlgHDJIOs3gpA=; b=QpTOTzdYj7oQzkrt/VJ/Dt6jRz6UFSR2jdTXcU8TNnnEyXEDS88IWVk6a/UzDCCofO 3c6A9frWTSJyf9gFBbu56GvLh2M4JeACp8F4XDpf15pHBFpXKBZMZzSSfiaU0Ya2g5Lc 8eu/3fh+zpg84LGdqhHAJw8ap0kC5isASc4za/BhlhBfR3mL5d5a/1KGB4fjirkyGrbG KaJW1k5zQ/p0rIbRe9NYheea7dk8k0jGxC5hz2OVibaIW39hrHK3fLNEHjP/f0oPwdii VhDEuVczLK6DDld2oF/U6ynzpEQd4wScvhsbRFM/w/32ADPQmZhGZOK49F//UFwI4peg jIiQ== X-Forwarded-Encrypted: i=1; AFNElJ+2Mftfz6m6sT4YWIALIaQJECKjMQk4HjAtouhgw5SAT5Aq11O/rrNNh43mBnJ35ATK9Dq5c4+UZUJuKqU=@vger.kernel.org X-Gm-Message-State: AOJu0YytChWTov+BvOe2PyIrGaANtoJYNWK/Vq3nXc8ctR/l1Of8ASKw y+J9Fx1D7ABPAPukwNK2HDIPuT/1aHHBmvT6SH5/9iHZ/XyK54XLaw9Z9dXS1KZe10HTnm4fg8n UyqAeontxWA== X-Received: from dly25-n1.prod.google.com ([2002:a05:701b:2059:10b0:135:e88b:8de6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:220c:b0:12c:8d32:9377 with SMTP id a92af1059eb24-13632d3e850mr918113c88.29.1779377763325; Thu, 21 May 2026 08:36:03 -0700 (PDT) Date: Thu, 21 May 2026 08:35:58 -0700 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.54.0.746.g67dd491aae-goog Message-ID: <20260521153558.1421014-1-irogers@google.com> Subject: [PATCH v1] perf build: Fix fsmount.o build From: Ian Rogers 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 Content-Type: text/plain; charset="UTF-8" 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 --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62313383982; Thu, 21 May 2026 16:49:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779382176; cv=none; b=Peb0a0LeAHHNlFbZmWBsOIYZ9qxcyH8LgrohVraJ1Zqsv2Y41yNxIgTz++0bMA8NKkKCzT3R8SYMr1kmv3yIpZvcxZ2nODeNROlhPNrhIjMHcGFybHQPF9nkrciXA9pnu+5vXS31HERZR1myj4NSFabvdaNk4va3PHaQT6ICstw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779382176; c=relaxed/simple; bh=uwIa0Z/ok4zc2TAdzNwVt3NEcQIHZ6z91FWezO15WdI=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=Vv2voWX8aYZ0/Ru4knvhboa+SRQ6eMtizaDA9YRx7cvOAwbHV3i7gR2NEHCldvR/cc6+qMADSIiBnm2OCO69ua9iiqlKHxb4a2gY0Lh1k+o6ffN3woyqMiMcFcBI5XXqmQRys1hNY6VJ4HILwjcbL+gNVe6ho1wmjeo3uTFpc3Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Bj5Gznu+; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Bj5Gznu+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE9681F000E9; Thu, 21 May 2026 16:49:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779382173; bh=zcenPJOvfJLDezljSJNclDrIU4pp2pyRhFZrVvbE1kk=; h=Date:From:To:Cc:Subject; b=Bj5Gznu+vAFsARABlgaKf/OHi2GZWGW22hJjbC2gJsJxir8Xn4ocwoQnS7+M7Nlfh XCRNaFXnilDHAWSRGr9X4jLBoMlx7SbGma2oFqMAk4NqD0HAnu4AeepmiI4pVyRpKA aiESz2+jIxM1lAaCvja81pHTdszHJUWuicplTxYjm7/2N2Impaxrzl7mdJzw/kznaV febdlsJiB868tiI/zd/ay+2DIK0XEuT00tSRKOgRlySAdbnsLvr/aA6UbzxPHgJwyT 0j6MMnxY9wyKzhgRY4SJNqGbII+9IdKEnsp7fT+XRaKrTKc/KUydsMoc93SzvjXvrF YuIA6PFk7Wiyw== Date: Thu, 21 May 2026 13:49:28 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Thorsten Leemhuis , Mark Brown , Namhyung Kim , Linux Kernel Mailing List , linux-perf-users@vger.kernel.org Subject: Re: [PATCH v1] perf build: Fix fsmount.o build Message-ID: <20260521153558.1421014-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Message-ID: <20260521164928.jdJfXEKR_6IoLPs6LJmgT5jPorxvHrzrla7-Vzwpxu0@z> > 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 > 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 > --- > 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