On Mon, 31 Jul 2023 14:59:47 -0700 Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx> wrote: > Assuming that is addressed. How do we merge the series? > The first 3 patches have serious conflicts with bpf trees. > > Maybe send the first 3 with extra selftest for above recursion > targeting bpf-next then we can have a merge commit that Steven can pull > into tracing? Would it be possible to do this by basing it off of one of Linus's tags, and doing the merge and conflict resolution in your tree before it gets to Linus? That way we can pull in that clean branch without having to pull in anything else from BPF. I believe Linus prefers this over having tracing having extra changes from BPF that are not yet in his tree. We only need these particular changes, we shouldn't be pulling in anything specific for BPF, as I believe that will cause issues on Linus's side. -- Steve > > Or if we can have acks for patches 4-9 we can pull the whole set into bpf-next.
