On Mon, 21 Mar 2022 15:50:17 -0700 Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx> wrote: > On Mon, Mar 21, 2022 at 3:46 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > > Hi Alexei, > > > > On Mon, 21 Mar 2022 15:12:05 -0700 Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx> wrote: > > > > > > That makes little sense. It's not an unusual merge conflict. > > > Peter's endbr series conflict with Masami's fprobe. > > > Peter has a trivial patch that fixes objtool warning. > > > The question is how to land that patch. > > > I think the best is for Linus to apply it after bpf-next->net-next gets > > > merged. > > > > Peter has other concerns, please read the thread and consider them. > > Masami is an expert in kprobe. He copy pasted a bit of kprobe logic > to make it into 'multi kprobe' (he calls it fprobe). > I believe he knows what he's doing. > Steven reviewed and tested that set. > We've tested it as well and don't have any correctness or api concerns. Sorry, that's my mistake to not Ccing to arch maintainers for the arch dependent patches. Let me update and send v13 for this fprobe series. Thank you, -- Masami Hiramatsu <mhiramat@xxxxxxxxxx>
