Messages in this thread | | | Date | Tue, 22 Mar 2022 09:46:06 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: build warnings after merge of the tip tree |
| |
Hi Alexei,
On Mon, 21 Mar 2022 15:12:05 -0700 Alexei Starovoitov <alexei.starovoitov@gmail.com> 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.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |