On Tue, 22 Mar 2022 09:38:07 -0700 Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx> wrote: > On Tue, Mar 22, 2022 at 7:32 AM Masami Hiramatsu <mhiramat@xxxxxxxxxx> wrote: > > > > Hi Alexei, > > > > So after this is merged, would you have a plan to merge the tip tree > > which has IBT to the bpf-next? Or should I wait for merging this series > > or IBT(ENDBR) series in Linus tree? > > > > If I add the no ENDBR annotation to the x86 rethook trampoline on this > > bpf-next branch, it will cause a build error... > > Right now (after arch bits revert) there are no build errors in bpf-next > and won't be any after the merge into Linus's tree either. > > linux-next is a proxy of what Linus's tree will look like in a few days. > Please create a single x86 arch patch against linux-next and make sure > Peter is happy with it. > We will land that patch at that time. OK, I'll make that patch on top of linux-next. That will allow us to build the rethook correctly. > > That patch will be pretty much the same as what you had earlier > with ENDBR annotation. And maybe regs->ss set which is future proofing > optional bit and not a functional part of the patch. Thank you, -- Masami Hiramatsu <mhiramat@xxxxxxxxxx>
