On Thu, Sep 09, 2021 at 09:45:03AM +0800, Hou Tao wrote:
> > >From a quick look, the patch is created from a pretty old tree and it
> > is missing the BPF_TRAMP_F_SKIP_FRAME. It is introduced in
> > commit 7e6f3cd89f04 ("bpf, x86: Store caller's ip in trampoline stack")
> > on Jul 15 2021 which is pretty old.
> >
> > I am only able to apply with the --3way merge like "git am --3way".
> > Andrii, is it fine to land the patch like this?
>
> I cannot apply it cleanly if using "git am --reject xx.patch", and it's OK if
> using "git cherry-pick commit_id", so I will rebase and repost it.
Hi Hou, could you repost the patch after rebasing? The dummy testing
struct_ops can be a separate patch targeting the bpf-next tree isntead.
Thanks!
