On Mon, Jul 27, 2020 at 04:55:39PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the driver-core tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from include/linux/dmi.h:5, > from drivers/firmware/efi/embedded-firmware.c:8: > drivers/firmware/efi/embedded-firmware.c:25:38: error: static declaration of 'efi_embedded_fw_list' follows non-static declaration > 25 | EFI_EMBEDDED_FW_VISIBILITY LIST_HEAD(efi_embedded_fw_list); > | ^~~~~~~~~~~~~~~~~~~~ > include/linux/list.h:24:19: note: in definition of macro 'LIST_HEAD' > 24 | struct list_head name = LIST_HEAD_INIT(name) > | ^~~~ > In file included from drivers/firmware/efi/embedded-firmware.c:17: > drivers/firmware/efi/embedded-firmware.h:16:25: note: previous declaration of 'efi_embedded_fw_list' was here > 16 | extern struct list_head efi_embedded_fw_list; > | ^~~~~~~~~~~~~~~~~~~~ > drivers/firmware/efi/embedded-firmware.c:26:33: error: static declaration of 'efi_embedded_fw_checked' follows non-static declaration > 26 | EFI_EMBEDDED_FW_VISIBILITY bool efi_embedded_fw_checked; > | ^~~~~~~~~~~~~~~~~~~~~~~ > In file included from drivers/firmware/efi/embedded-firmware.c:17: > drivers/firmware/efi/embedded-firmware.h:17:13: note: previous declaration of 'efi_embedded_fw_checked' was here > 17 | extern bool efi_embedded_fw_checked; > | ^~~~~~~~~~~~~~~~~~~~~~~ > > Caused by commit > > 2d38dbf89a06 ("test_firmware: Test platform fw loading on non-EFI systems") > > CONFIG_TEST_FIRMWARE=m for this build. > > I have used the driver-core tree from next-20200724 for today. Thanks, I've reverted this from my tree now. greg k-h