From: Leon Romanovsky <leon@kernel.org>
To: David Miller <davem@davemloft.net>
Cc: thor.thayer@linux.intel.com, heiko@sntech.de,
irusskikh@marvell.com, andreas@gaisler.com,
chris.snook@gmail.com, dave@thedillows.org,
jes@trained-monkey.org, iyappan@os.amperecomputing.com,
quan@os.amperecomputing.com, linux-acenic@sunsite.dk,
andy@greyhouse.net, akiyano@amazon.com,
linux-rockchip@lists.infradead.org, wens@csie.org,
LinoSanfilippo@gmx.de, vfalico@gmail.com, kuba@kernel.org,
thomas.lendacky@amd.com, jcliburn@gmail.com,
j.vosburgh@gmail.com, keyur@os.amperecomputing.com,
mripard@kernel.org, pcnet32@frontier.com, bp@alien8.de,
nios2-dev@lists.rocketboards.org,
linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, ionut@badula.org,
netanel@amazon.com, mark.einon@gmail.com
Subject: Re: [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition
Date: Mon, 13 Apr 2020 08:26:37 +0300 [thread overview]
Message-ID: <20200413052637.GG334007@unreal> (raw)
In-Reply-To: <20200412.220739.516022706077351913.davem@davemloft.net>
On Sun, Apr 12, 2020 at 10:07:39PM -0700, David Miller wrote:
> From: Leon Romanovsky <leon@kernel.org>
> 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@alien8.de>
> >> Date: Sat, 11 Apr 2020 17:56:23 +0200
> >>
> >> > From: Borislav Petkov <bp@suse.de>
> >> >
> >> > 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@suse.de>
> >>
> >> 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-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-04-13 5:26 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 8:52 [PATCH net-next v1 00/18] Clean driver, module and FW versions Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 01/18] net/bond: Delete driver and module versions Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 02/18] net/dummy: Ditch " Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 03/18] net/3com: Delete driver and module versions from 3com drivers Leon Romanovsky
2020-04-11 15:56 ` [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition Borislav Petkov
2020-04-11 16:11 ` Leon Romanovsky
2020-04-11 17:35 ` Borislav Petkov
2020-04-11 18:10 ` Leon Romanovsky
2020-04-11 18:41 ` Borislav Petkov
2020-04-13 4:03 ` David Miller
2020-04-13 4:55 ` Leon Romanovsky
2020-04-13 5:07 ` David Miller
2020-04-13 5:26 ` Leon Romanovsky [this message]
2020-04-13 5:36 ` David Miller
2020-04-13 8:04 ` Borislav Petkov
2020-04-13 8:40 ` Leon Romanovsky
2020-04-14 12:23 ` Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 04/18] net/adaptec: Clean driver versions Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 05/18] net/aeroflex: Clean ethtool_info struct assignments Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 06/18] net/aeroflex: Don't assign FW if it is not available Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 07/18] net/agere: Delete unneeded driver version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 08/18] net/alacritech: Delete " Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 09/18] net/allwinner: Remove " Leon Romanovsky
2020-02-24 9:43 ` Maxime Ripard
2020-02-24 8:53 ` [PATCH net-next v1 10/18] net/alteon: Properly report FW version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 11/18] net/althera: Delete hardcoded driver version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 12/18] net/amazon: Ensure that driver version is aligned to the linux kernel Leon Romanovsky
2020-02-24 9:03 ` Kiyanovski, Arthur
2020-02-24 9:41 ` Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 13/18] net/amd: Remove useless driver version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 14/18] net/apm: " Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 15/18] net/apm: Properly mark absence of FW Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 16/18] net/aquantia: Delete module version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 17/18] net/arc: Delete driver version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 18/18] net/atheros: Clean atheros code from " Leon Romanovsky
2020-02-24 18:15 ` Chris Snook
2020-02-24 19:49 ` [PATCH net-next v1 00/18] Clean driver, module and FW versions David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200413052637.GG334007@unreal \
--to=leon@kernel.org \
--cc=LinoSanfilippo@gmx.de \
--cc=akiyano@amazon.com \
--cc=andreas@gaisler.com \
--cc=andy@greyhouse.net \
--cc=bp@alien8.de \
--cc=chris.snook@gmail.com \
--cc=dave@thedillows.org \
--cc=davem@davemloft.net \
--cc=heiko@sntech.de \
--cc=ionut@badula.org \
--cc=irusskikh@marvell.com \
--cc=iyappan@os.amperecomputing.com \
--cc=j.vosburgh@gmail.com \
--cc=jcliburn@gmail.com \
--cc=jes@trained-monkey.org \
--cc=keyur@os.amperecomputing.com \
--cc=kuba@kernel.org \
--cc=linux-acenic@sunsite.dk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.einon@gmail.com \
--cc=mripard@kernel.org \
--cc=netanel@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=nios2-dev@lists.rocketboards.org \
--cc=pcnet32@frontier.com \
--cc=quan@os.amperecomputing.com \
--cc=thomas.lendacky@amd.com \
--cc=thor.thayer@linux.intel.com \
--cc=vfalico@gmail.com \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).