Messages in this thread | | | From | Masahiro Yamada <> | Date | Mon, 23 May 2022 14:37:28 +0900 | Subject | Re: linux-next: manual merge of the tip tree with the kbuild tree |
| |
On Mon, May 23, 2022 at 1:24 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > 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. > > -- > Cheers, > Stephen Rothwell
I think you can fix up around line 420 of scripts/Makefile.build
$(multi-obj-m): objtool-enabled := $(delay-objtool) $(multi-obj-m): part-of-module := y $(multi-obj-m): linked-object := y <--- Add this $(multi-obj-m): %.o: %.mod FORCE $(call if_changed_rule,ld_multi_m)
-- Best Regards Masahiro Yamada
| |