On Tue, Mar 02, 2021 at 01:24:27PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Tue, Mar 02, 2021 at 02:23:14PM +0000, Mike Leach escreveu:
> > On Tue, 2 Mar 2021 at 12:52, Arnaldo Carvalho de Melo <a...@kernel.org> 
> > wrote:
> > > Em Wed, Feb 24, 2021 at 09:48:29AM -0700, Mathieu Poirier escreveu:
> > > > I noticed there is a couple of patchsets [1][2] that haven't made it
> > > > to your tree for the coming v5.12 cycle.  Do you think that can still
> > > > be done?
> 
> > > > I tallied the patches here to make it easier for you to pick up.
> 
> > > > Applies cleanly on perf/core (84b7725536d8)
> 
> > > > [1]. 
> > > > https://lore.kernel.org/lkml/20210202214040.32349-1-mike.le...@linaro.org/
> > > > [2]. 
> > > > https://lore.kernel.org/lkml/20210213113220.292229-1-leo....@linaro.org/
> 
> > > These are not applying right now, I've pushed what I have to
> > > tmp.perf/core, please take a look, I'll get back to this after
> > > processing fixes for v5.12 and what is outstanding for v5.13.
>  
> > I've tried [1] on both Linux-5.12-rc1 and your tmp.perf/core and it
> > applies cleanly on both.
> 
> Can you please try one more time, these are the last csets on this
> branch:
> 
>   $ git log --oneline acme/tmp.perf/core -10
>   8e1488a46dcf73b1 (HEAD -> perf/core, five/perf/core, acme/tmp.perf/core, 
> acme.korg/tmp.perf/core) perf cs-etm: Detect pid in VMID for kernel running 
> at EL2
>   47f0d94c203751dd perf cs-etm: Add helper cs_etm__get_pid_fmt()
>   30cb76aabfb4deab perf cs-etm: Support PID tracing in config
>   8c559e8d68630d64 perf cs-etm: Fix bitmap for option
>   2bb4ccbd95d7fbf5 tools headers UAPI: Update tools' copy of 
> linux/coresight-pmu.h
>   42b2b570b34afb5f perf cs-etm: Update ETM metadata format
>   83bf6fb8b076c72f perf vendor events power9: Remove unsupported metrics
>   34968b9327c83589 perf buildid-cache: Add test for PE executable
>   9bb8b74bdb186bd3 perf docs: Add man pages to see also
>   d9fd5a718977702f perf tools: Generate mips syscalls_n64.c syscall table
>   $

As far as I can tell you have all 6 patches.

> 
> I think it doesn't apply because I applied a series from Mathieu
> touching files affected by those two patchkits.
> 
> - Arnaldo
>  
> > Let me know if there is anything else I can try.
> > 
> > Thanks
> > 
> > Mike
> > 
> > 
> > 
> > -- 
> > Mike Leach
> > Principal Engineer, ARM Ltd.
> > Manchester Design Centre. UK
> 
> -- 
> 
> - Arnaldo

Reply via email to