[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220322094526.436ca4f7@elm.ozlabs.ibm.com>
Date: Tue, 22 Mar 2022 09:46:06 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alexei Starovoitov <alexei.starovoitov@...il.com>
Cc: Peter Zijlstra <peterz@...radead.org>,
Daniel Borkmann <daniel@...earbox.net>,
Andrii Nakryiko <andrii@...nel.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Masami Hiramatsu <mhiramat@...nel.org>,
Steven Rostedt <rostedt@...dmis.org>,
Alexei Starovoitov <ast@...nel.org>,
"H.J. Lu" <hjl.tools@...il.com>,
"Edgecombe, Rick P" <rick.p.edgecombe@...el.com>,
Mike Rapoport <rppt@...nel.org>,
linux-toolchains <linux-toolchains@...r.kernel.org>,
Andrew Cooper <Andrew.Cooper3@...rix.com>,
Nick Desaulniers <ndesaulniers@...gle.com>,
bpf <bpf@...r.kernel.org>, Networking <netdev@...r.kernel.org>,
David Miller <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>
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@...il.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
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists