On Sun, Apr 12, 2020 at 10:07:39PM -0700, David Miller wrote: > From: Leon Romanovsky <leon@xxxxxxxxxx> > Date: Mon, 13 Apr 2020 07:55:55 +0300 > > > On Sun, Apr 12, 2020 at 09:03:41PM -0700, David Miller wrote: > >> From: Borislav Petkov <bp@xxxxxxxxx> > >> Date: Sat, 11 Apr 2020 17:56:23 +0200 > >> > >> > From: Borislav Petkov <bp@xxxxxxx> > >> > > >> > Change the include order so that MODULE_ARCH_VERMAGIC from the arch > >> > header arch/x86/include/asm/module.h gets used instead of the fallback > >> > from include/linux/vermagic.h and thus fix: > >> > > >> > In file included from ./include/linux/module.h:30, > >> > from drivers/net/ethernet/3com/3c515.c:56: > >> > ./arch/x86/include/asm/module.h:73: warning: "MODULE_ARCH_VERMAGIC" redefined > >> > 73 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY > >> > | > >> > In file included from drivers/net/ethernet/3com/3c515.c:25: > >> > ./include/linux/vermagic.h:28: note: this is the location of the previous definition > >> > 28 | #define MODULE_ARCH_VERMAGIC "" > >> > | > >> > > >> > Fixes: 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers") > >> > Signed-off-by: Borislav Petkov <bp@xxxxxxx> > >> > >> I'm so confused, that commit in the Fixes: tag is _removing_ code but adding > >> new #include directives?!?! > >> > >> Is vermagic.h really needed in these files? > > > > You are completely right, it is not needed at all in those files. > > Ok let's just remove it to fix this. Thanks a lot. How do you want us to handle it? Boris resend, me to send, you to fix? Thanks _______________________________________________ Linux-rockchip mailing list Linux-rockchip@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/linux-rockchip