Re: [PATCH 6.6 000/192] 6.6.36-rc1 review
From: Greg Kroah-Hartman
Date: Thu Jun 27 2024 - 07:30:33 EST
On Tue, Jun 25, 2024 at 05:08:19PM +0200, Arnd Bergmann wrote:
> On Tue, Jun 25, 2024, at 16:43, Naresh Kamboju wrote:
> > On Tue, 25 Jun 2024 at 16:39, Naresh Kamboju <naresh.kamboju@xxxxxxxxxx> wrote:
> >> On Tue, 25 Jun 2024 at 15:18, Greg Kroah-Hartman
> >> <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> >> arm-linux-gnueabihf-ld: drivers/firmware/efi/efi-init.o: in function
> >> `.LANCHOR1':
> >> efi-init.c:(.data+0x0): multiple definition of `screen_info';
> >> arch/arm/kernel/setup.o:setup.c:(.data+0x12c): first defined here
> >> make[3]: *** [scripts/Makefile.vmlinux_o:62: vmlinux.o] Error 1
> >
> > git bisect is pointing to this commit,
> > [13cfc04b25c30b9fea2c953b7ed1c61de4c56c1f] efi: move screen_info into
> > efi init code
>
> I think we should drop this patch: it's not a bugfix but was only
> pulled in as a dependency for another patch. The series was rather
> complicated to stage correctly, so keeping my screen_info patch
> would require pulling in more stuff.
Now dropped. I've fixed up the other patches that was pulled in here to
not need this one, it was a simple one-line loongarch-only fix that
should be fine now.
thanks,
greg k-h