Re: [PATCH 0/6] uprobes/x86: Cleanups and fixes

[Jiri Olsa <olsajiri@gmail.com>]

On Fri, Aug 22, 2025 at 11:05:59AM -0700, Andrii Nakryiko wrote:
> On Fri, Aug 22, 2025 at 1:42 AM Jiri Olsa <olsajiri@gmail.com> wrote:
> >
> > On Thu, Aug 21, 2025 at 04:18:03PM +0200, Jiri Olsa wrote:
> > > On Thu, Aug 21, 2025 at 02:28:22PM +0200, Peter Zijlstra wrote:
> > > > Hi,
> > > >
> > > > These are cleanups and fixes that I applied on top of Jiri's patches:
> > > >
> > > >   https://lkml.kernel.org/r/20250720112133.244369-1-jolsa@kernel.org
> > > >
> > > > The combined lot sits in:
> > > >
> > > >   git://git.kernel.org/pub/scm/linux/kernel/git/peterz/queue.git perf/core
> > > >
> > > > Jiri was going to send me some selftest updates that might mean rebasing that
> > > > tree, but we'll see. If this all works we'll land it in -tip.
> > > >
> > >
> > > hi,
> > > sent the selftest fix in here:
> > >   https://lore.kernel.org/bpf/20250821141557.13233-1-jolsa@kernel.org/T/#u
> >
> > Andrii,
> > do we want any special logistic for the bpf/selftest changes or it could
> > go through the tip tree?
> 
> let's route selftest changes through tip together with the rest of
> uprobe changes, it's unlikely to conflict

fyi, there's conflict now between tip/perf/core and bpf-next/master
in the selftests.. due to usdt SIB argument support changes

please let me know if you need any help in resolving that

jirka