Re: linux-next: manual merge of the tip tree with the kbuild tree

Josh Poimboeuf
2022-05-23T16:23:16Z

On Mon, May 23, 2022 at 03:47:58PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 23 May 2022 14:24:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > scripts/Makefile.build
> >
> > between commit:
> >
> > 0212301af7bb ("kbuild: do not create *.prelink.o for Clang LTO or IBT")
> >
> > from the kbuild tree and commit:
> >
> > 753da4179d08 ("objtool: Remove --lto and --vmlinux in favor of --link")
> >
> > from the tip tree.
> >
> > I am not sure if I fixed this up correctly, please check the final result
> > when linux-next is released.
> >
> > I fixed it up (I used the former version) and can carry the fix as
> > necessary. This is now fixed as far as linux-next is concerned, but any
> > non trivial conflicts should be mentioned to your upstream maintainer
> > when your tree is submitted for merging. You may also want to consider
> > cooperating with the maintainer of the conflicting tree to minimise any
> > particularly complex conflicts.
>
> That produced may warnings :-( so I tried the below resolution instead.

Looks good to me. I guess the confusing bit was that in most cases,
CONFIG_STACK_VALIDATION has been replaced with CONFIG_OBJTOOL.

--
Josh