Re: [FYI] [PATCH] merge resolution commit for perf trace beauty conflict

[Arnaldo Carvalho de Melo <acme@kernel.org>]

On Thu, May 21, 2026 at 10:55:02AM -0700, Namhyung Kim wrote:
> On Thu, May 21, 2026 at 02:09:14PM -0300, Arnaldo Carvalho de Melo wrote:
> > Just FYI, this is the merge commit solving this conflict.
> > 
> > Author: Arnaldo Carvalho de Melo <acme@redhat.com>
> > commit 86c8774ce08b931debdaa3f61f5a033639c183ca
> > Merge: f8d0db39bcc536ef 758c807bb943138f
> >     Merge remote-tracking branch 'torvalds/master' into perf-tools-next
> >     
> >     Fixup clash of:
> >     
> >       552636b9317c8a84 ("perf trace: Add beautifier script for fsmount flags")
> >     
> >     That went via Namhyung upstream and the following ones in the
> >     perf-tools-next tree:
> >     
> >       32969ef6e3e1979a ("perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase")
> >       537609924c43715e ("perf trace beauty: Make beauty generated C code standalone .o files")
> >     
> >     This complements sent by Ian Rogers.
> 
> As long as you have this with Ian's fix,
> 
> Acked-by: Namhyung Kim <namhyung@kernel.org>

Yeah, that is the case, justg added your Acked-by, thanks for checking
and providing it!

- Arnaldo