From: Mark Brown <broonie@kernel.org>
To: Ian Rogers <irogers@google.com>
Cc: Thorsten Leemhuis <linux@leemhuis.info>,
Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>,
Namhyung Kim <namhyung@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the perf tree with the origin tree
Date: Thu, 21 May 2026 16:30:57 +0100 [thread overview]
Message-ID: <e08366fa-5fda-4534-8545-5d446734387f@sirena.org.uk> (raw)
In-Reply-To: <CAP-5=fVH=fETWYO=VKuA+aC6=qjyqEmku6JeJhB=q=Nns+rMEQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]
On Thu, May 21, 2026 at 08:04:11AM -0700, Ian Rogers wrote:
> On Thu, May 21, 2026 at 7:55 AM Thorsten Leemhuis <linux@leemhuis.info> wrote:
> > On 5/21/26 12:19, Mark Brown wrote:
> > > between commit:
> > > 552636b9317c8 ("perf trace: Add beautifier script for fsmount flags")
> > > from the origin tree and commits:
> > > 32969ef6e3e19 ("perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase")
> I believe this commit has issues with "perf trace: Add beautifier
> script for fsmount flags":
> https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git/commit/?h=perf-tools&id=552636b9317c8a843dd4496d77e56976ab48c76b
> This change went to the perf-tools tree and then to linux/master,
> while "perf build: Pre-generate BPF skeleton tooling during umbrella
> prepare phase" has gone to perf-tools-next and then to linux-next.
> I'll look into a fix.
Yes, that's exactly the conflict I identified above - the lack of
coordination there was pretty surprising TBH, and also the fact that
552636b9317c8 ("perf trace: Add beautifier script for fsmount flags")
went in after -rc1.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2026-05-21 15:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-21 10:19 Mark Brown
2026-05-21 14:55 ` Thorsten Leemhuis
2026-05-21 15:04 ` Ian Rogers
2026-05-21 15:30 ` Mark Brown [this message]
2026-05-21 15:33 ` Ian Rogers
2026-05-21 15:35 ` [PATCH v1] perf build: Fix fsmount.o build Ian Rogers
2026-05-21 15:58 ` 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
-- strict thread matches above, loose matches on Subject: below --
2026-05-21 10:18 Mark Brown
2024-06-17 16:23 Mark Brown
2024-06-18 3:21 ` Namhyung Kim
2024-06-17 16:19 broonie
2022-08-05 11:45 broonie
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=e08366fa-5fda-4534-8545-5d446734387f@sirena.org.uk \
--to=broonie@kernel.org \
--cc=acme@redhat.com \
--cc=arnaldo.melo@gmail.com \
--cc=irogers@google.com \
--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
all inboxes | Powered by JetHome®