On Mon, Sep 12, 2022 at 8:59 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Hi Masahiro, > > On Fri, 9 Sep 2022 19:30:24 +0900 Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote: > > > > The following fix will make it working again. > > > diff --git a/Makefile b/Makefile > > index b459e3d0fc5a..c8fba03ec93c 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -1151,7 +1151,6 @@ quiet_cmd_autoksyms_h = GEN $@ > > $(autoksyms_h): > > $(call cmd,autoksyms_h) > > > > -targets += vmlinux.o > > vmlinux.o: autoksyms_recursive $(KBUILD_VMLINUX_OBJS) > > $(KBUILD_VMLINUX_LIBS) FORCE > > $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux_o > > Thank you. The kbuild tree merge builds fine again. > > -- > Cheers, > Stephen Rothwell That is good news. BTW, as you may have noticed already, sub-directories are now listed in ./Kbuild. So, you will need to move the rust/ entry accordingly. obj-$(CONFIG_IO_URING) += io_uring/ obj-$(CONFIG_RUST) += rust/ <--- Move from Makefile obj-y += drivers/ I have not tested the merge result, though. -- Best Regards Masahiro Yamada
