* [PATCH net-next 0/4] Remove vermagic header from global include folder
@ 2020-04-14 15:57 Leon Romanovsky
2020-04-14 15:57 ` [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header Leon Romanovsky
0 siblings, 1 reply; 9+ messages in thread
From: Leon Romanovsky @ 2020-04-14 15:57 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski
Cc: Leon Romanovsky, Andy Gospodarek, Borislav Petkov, Ion Badulescu,
Jay Vosburgh, Jessica Yu, linux-kernel, linux-pm, netdev,
oss-drivers, Pensando Drivers, Salil Mehta, Sebastian Reichel,
Shannon Nelson, Veaceslav Falico, Yisen Zhuang
From: Leon Romanovsky <leonro@mellanox.com>
Hi,
This is followup to the failure reported by Borislav [1] and suggested
fix later on [2].
The series removes all includes of linux/vermagic.h, updates hns and
nfp to use same kernel versioning scheme (exactly like we did for
other drivers in previous cycle) and removes vermagic.h from global
include folder.
[1] https://lore.kernel.org/lkml/20200411155623.GA22175@zn.tnic
[2] https://lore.kernel.org/lkml/20200413080452.GA3772@zn.tnic
------------------------------------------------------------
1. Honestly, I have no idea if it can go to net-rc, clearly not all my
patches are fixes, so I'm sending them to the net-next.
2. Still didn't get response from kbuild, but it passed my own
compilation tests.
Thanks
Leon Romanovsky (4):
drivers: Remove inclusion of vermagic header
net/hns: Remove custom driver version in favour of global one
net/nfp: Update driver to use global kernel version
kernel/module: Hide vermagic header file from general use
drivers/net/bonding/bonding_priv.h | 2 +-
drivers/net/ethernet/3com/3c509.c | 1 -
drivers/net/ethernet/3com/3c515.c | 1 -
drivers/net/ethernet/adaptec/starfire.c | 1 -
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 ---
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 4 ----
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 ----
drivers/net/ethernet/netronome/nfp/nfp_main.c | 3 ---
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 --
drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 +-
drivers/power/supply/test_power.c | 2 +-
kernel/module.c | 2 +-
{include/linux => kernel}/vermagic.h | 0
net/ethtool/ioctl.c | 3 +--
14 files changed, 5 insertions(+), 25 deletions(-)
rename {include/linux => kernel}/vermagic.h (100%)
--
2.25.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header
2020-04-14 15:57 [PATCH net-next 0/4] Remove vermagic header from global include folder Leon Romanovsky
@ 2020-04-14 15:57 ` Leon Romanovsky
2020-04-14 16:00 ` Borislav Petkov
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Leon Romanovsky @ 2020-04-14 15:57 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski
Cc: Leon Romanovsky, Andy Gospodarek, Borislav Petkov, Ion Badulescu,
Jay Vosburgh, linux-pm, netdev, Pensando Drivers,
Sebastian Reichel, Shannon Nelson, Veaceslav Falico
From: Leon Romanovsky <leonro@mellanox.com>
Get rid of linux/vermagic.h includes, so that MODULE_ARCH_VERMAGIC from
the arch header arch/x86/include/asm/module.h won't be redefined.
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>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/net/bonding/bonding_priv.h | 2 +-
drivers/net/ethernet/3com/3c509.c | 1 -
drivers/net/ethernet/3com/3c515.c | 1 -
drivers/net/ethernet/adaptec/starfire.c | 1 -
drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 +-
drivers/power/supply/test_power.c | 2 +-
net/ethtool/ioctl.c | 3 +--
7 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h
index 45b77bc8c7b3..48cdf3a49a7d 100644
--- a/drivers/net/bonding/bonding_priv.h
+++ b/drivers/net/bonding/bonding_priv.h
@@ -14,7 +14,7 @@
#ifndef _BONDING_PRIV_H
#define _BONDING_PRIV_H
-#include <linux/vermagic.h>
+#include <generated/utsrelease.h>
#define DRV_NAME "bonding"
#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index b762176a1406..139d0120f511 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -85,7 +85,6 @@
#include <linux/device.h>
#include <linux/eisa.h>
#include <linux/bitops.h>
-#include <linux/vermagic.h>
#include <linux/uaccess.h>
#include <asm/io.h>
diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c
index 90312fcd6319..47b4215bb93b 100644
--- a/drivers/net/ethernet/3com/3c515.c
+++ b/drivers/net/ethernet/3com/3c515.c
@@ -22,7 +22,6 @@
*/
-#include <linux/vermagic.h>
#define DRV_NAME "3c515"
#define CORKSCREW 1
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index 2db42211329f..a64191fc2af9 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -45,7 +45,6 @@
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <linux/uaccess.h>
#include <asm/io.h>
-#include <linux/vermagic.h>
/*
* The current frame processor firmware fails to checksum a fragment
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
index 588c62e9add7..3ed150512091 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
@@ -6,7 +6,7 @@
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/utsname.h>
-#include <linux/vermagic.h>
+#include <generated/utsrelease.h>
#include "ionic.h"
#include "ionic_bus.h"
diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c
index 65c23ef6408d..b3c05ff05783 100644
--- a/drivers/power/supply/test_power.c
+++ b/drivers/power/supply/test_power.c
@@ -16,7 +16,7 @@
#include <linux/power_supply.h>
#include <linux/errno.h>
#include <linux/delay.h>
-#include <linux/vermagic.h>
+#include <generated/utsrelease.h>
enum test_power_id {
TEST_AC,
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 89d0b1827aaf..d3cb5a49a0ce 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -17,7 +17,6 @@
#include <linux/phy.h>
#include <linux/bitops.h>
#include <linux/uaccess.h>
-#include <linux/vermagic.h>
#include <linux/vmalloc.h>
#include <linux/sfp.h>
#include <linux/slab.h>
@@ -28,7 +27,7 @@
#include <net/xdp_sock.h>
#include <net/flow_offload.h>
#include <linux/ethtool_netlink.h>
-
+#include <generated/utsrelease.h>
#include "common.h"
/*
--
2.25.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header
2020-04-14 15:57 ` [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header Leon Romanovsky
@ 2020-04-14 16:00 ` Borislav Petkov
2020-04-14 17:26 ` Leon Romanovsky
2020-04-14 17:07 ` Sebastian Reichel
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Borislav Petkov @ 2020-04-14 16:00 UTC (permalink / raw)
To: Leon Romanovsky
Cc: David S . Miller, Jakub Kicinski, Leon Romanovsky,
Andy Gospodarek, Ion Badulescu, Jay Vosburgh, linux-pm, netdev,
Pensando Drivers, Sebastian Reichel, Shannon Nelson,
Veaceslav Falico
On Tue, Apr 14, 2020 at 06:57:29PM +0300, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
>
> Get rid of linux/vermagic.h includes, so that MODULE_ARCH_VERMAGIC from
> the arch header arch/x86/include/asm/module.h won't be redefined.
>
> 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>
Just my SOB like that doesn't mean anything. You should add
Co-developed-by: me
Signed-off-by: me
if you want to state that we both worked on this fix.
Thx.
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header
2020-04-14 15:57 ` [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header Leon Romanovsky
2020-04-14 16:00 ` Borislav Petkov
@ 2020-04-14 17:07 ` Sebastian Reichel
2020-04-14 17:32 ` Shannon Nelson
2020-04-14 17:45 ` Borislav Petkov
3 siblings, 0 replies; 9+ messages in thread
From: Sebastian Reichel @ 2020-04-14 17:07 UTC (permalink / raw)
To: Leon Romanovsky
Cc: David S . Miller, Jakub Kicinski, Leon Romanovsky,
Andy Gospodarek, Borislav Petkov, Ion Badulescu, Jay Vosburgh,
linux-pm, netdev, Pensando Drivers, Shannon Nelson,
Veaceslav Falico
[-- Attachment #1: Type: text/plain, Size: 4857 bytes --]
Hi,
On Tue, Apr 14, 2020 at 06:57:29PM +0300, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
>
> Get rid of linux/vermagic.h includes, so that MODULE_ARCH_VERMAGIC from
> the arch header arch/x86/include/asm/module.h won't be redefined.
>
> 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>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
# for drivers/power/supply/test_power.c
Acked-by: Sebastian Reichel <sre@kernel.org>
-- Sebastian
> drivers/net/bonding/bonding_priv.h | 2 +-
> drivers/net/ethernet/3com/3c509.c | 1 -
> drivers/net/ethernet/3com/3c515.c | 1 -
> drivers/net/ethernet/adaptec/starfire.c | 1 -
> drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 +-
> drivers/power/supply/test_power.c | 2 +-
> net/ethtool/ioctl.c | 3 +--
> 7 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h
> index 45b77bc8c7b3..48cdf3a49a7d 100644
> --- a/drivers/net/bonding/bonding_priv.h
> +++ b/drivers/net/bonding/bonding_priv.h
> @@ -14,7 +14,7 @@
>
> #ifndef _BONDING_PRIV_H
> #define _BONDING_PRIV_H
> -#include <linux/vermagic.h>
> +#include <generated/utsrelease.h>
>
> #define DRV_NAME "bonding"
> #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
> diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
> index b762176a1406..139d0120f511 100644
> --- a/drivers/net/ethernet/3com/3c509.c
> +++ b/drivers/net/ethernet/3com/3c509.c
> @@ -85,7 +85,6 @@
> #include <linux/device.h>
> #include <linux/eisa.h>
> #include <linux/bitops.h>
> -#include <linux/vermagic.h>
>
> #include <linux/uaccess.h>
> #include <asm/io.h>
> diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c
> index 90312fcd6319..47b4215bb93b 100644
> --- a/drivers/net/ethernet/3com/3c515.c
> +++ b/drivers/net/ethernet/3com/3c515.c
> @@ -22,7 +22,6 @@
>
> */
>
> -#include <linux/vermagic.h>
> #define DRV_NAME "3c515"
>
> #define CORKSCREW 1
> diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
> index 2db42211329f..a64191fc2af9 100644
> --- a/drivers/net/ethernet/adaptec/starfire.c
> +++ b/drivers/net/ethernet/adaptec/starfire.c
> @@ -45,7 +45,6 @@
> #include <asm/processor.h> /* Processor type for cache alignment. */
> #include <linux/uaccess.h>
> #include <asm/io.h>
> -#include <linux/vermagic.h>
>
> /*
> * The current frame processor firmware fails to checksum a fragment
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
> index 588c62e9add7..3ed150512091 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
> @@ -6,7 +6,7 @@
> #include <linux/module.h>
> #include <linux/netdevice.h>
> #include <linux/utsname.h>
> -#include <linux/vermagic.h>
> +#include <generated/utsrelease.h>
>
> #include "ionic.h"
> #include "ionic_bus.h"
> diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c
> index 65c23ef6408d..b3c05ff05783 100644
> --- a/drivers/power/supply/test_power.c
> +++ b/drivers/power/supply/test_power.c
> @@ -16,7 +16,7 @@
> #include <linux/power_supply.h>
> #include <linux/errno.h>
> #include <linux/delay.h>
> -#include <linux/vermagic.h>
> +#include <generated/utsrelease.h>
>
> enum test_power_id {
> TEST_AC,
> diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
> index 89d0b1827aaf..d3cb5a49a0ce 100644
> --- a/net/ethtool/ioctl.c
> +++ b/net/ethtool/ioctl.c
> @@ -17,7 +17,6 @@
> #include <linux/phy.h>
> #include <linux/bitops.h>
> #include <linux/uaccess.h>
> -#include <linux/vermagic.h>
> #include <linux/vmalloc.h>
> #include <linux/sfp.h>
> #include <linux/slab.h>
> @@ -28,7 +27,7 @@
> #include <net/xdp_sock.h>
> #include <net/flow_offload.h>
> #include <linux/ethtool_netlink.h>
> -
> +#include <generated/utsrelease.h>
> #include "common.h"
>
> /*
> --
> 2.25.2
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header
2020-04-14 16:00 ` Borislav Petkov
@ 2020-04-14 17:26 ` Leon Romanovsky
2020-04-14 17:44 ` Borislav Petkov
0 siblings, 1 reply; 9+ messages in thread
From: Leon Romanovsky @ 2020-04-14 17:26 UTC (permalink / raw)
To: Borislav Petkov
Cc: David S . Miller, Jakub Kicinski, Andy Gospodarek, Ion Badulescu,
Jay Vosburgh, linux-pm, netdev, Pensando Drivers,
Sebastian Reichel, Shannon Nelson, Veaceslav Falico
On Tue, Apr 14, 2020 at 06:00:41PM +0200, Borislav Petkov wrote:
> On Tue, Apr 14, 2020 at 06:57:29PM +0300, Leon Romanovsky wrote:
> > From: Leon Romanovsky <leonro@mellanox.com>
> >
> > Get rid of linux/vermagic.h includes, so that MODULE_ARCH_VERMAGIC from
> > the arch header arch/x86/include/asm/module.h won't be redefined.
> >
> > 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>
>
> Just my SOB like that doesn't mean anything. You should add
>
> Co-developed-by: me
> Signed-off-by: me
>
> if you want to state that we both worked on this fix.
I personally don't use such notation and rely on the submission flow.
The patch has two authors both written in SOBs and it will be visible
in the git history that those SOBs are not maintainers additions.
Can you please reply to the original patch with extra tags you want,
so b4 and patchworks will pick them without me resending the patches?
Thanks
>
> Thx.
>
> --
> Regards/Gruss,
> Boris.
>
> SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header
2020-04-14 15:57 ` [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header Leon Romanovsky
2020-04-14 16:00 ` Borislav Petkov
2020-04-14 17:07 ` Sebastian Reichel
@ 2020-04-14 17:32 ` Shannon Nelson
2020-04-14 17:45 ` Borislav Petkov
3 siblings, 0 replies; 9+ messages in thread
From: Shannon Nelson @ 2020-04-14 17:32 UTC (permalink / raw)
To: Leon Romanovsky, David S . Miller, Jakub Kicinski
Cc: Leon Romanovsky, Andy Gospodarek, Borislav Petkov, Ion Badulescu,
Jay Vosburgh, linux-pm, netdev, Pensando Drivers,
Sebastian Reichel, Veaceslav Falico
On 4/14/20 8:57 AM, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
>
> Get rid of linux/vermagic.h includes, so that MODULE_ARCH_VERMAGIC from
> the arch header arch/x86/include/asm/module.h won't be redefined.
>
> 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>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
for ionic driver:
Acked-by: Shannon Nelson <snelson@pensando.io>
> ---
> drivers/net/bonding/bonding_priv.h | 2 +-
> drivers/net/ethernet/3com/3c509.c | 1 -
> drivers/net/ethernet/3com/3c515.c | 1 -
> drivers/net/ethernet/adaptec/starfire.c | 1 -
> drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 +-
> drivers/power/supply/test_power.c | 2 +-
> net/ethtool/ioctl.c | 3 +--
> 7 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h
> index 45b77bc8c7b3..48cdf3a49a7d 100644
> --- a/drivers/net/bonding/bonding_priv.h
> +++ b/drivers/net/bonding/bonding_priv.h
> @@ -14,7 +14,7 @@
>
> #ifndef _BONDING_PRIV_H
> #define _BONDING_PRIV_H
> -#include <linux/vermagic.h>
> +#include <generated/utsrelease.h>
>
> #define DRV_NAME "bonding"
> #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
> diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
> index b762176a1406..139d0120f511 100644
> --- a/drivers/net/ethernet/3com/3c509.c
> +++ b/drivers/net/ethernet/3com/3c509.c
> @@ -85,7 +85,6 @@
> #include <linux/device.h>
> #include <linux/eisa.h>
> #include <linux/bitops.h>
> -#include <linux/vermagic.h>
>
> #include <linux/uaccess.h>
> #include <asm/io.h>
> diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c
> index 90312fcd6319..47b4215bb93b 100644
> --- a/drivers/net/ethernet/3com/3c515.c
> +++ b/drivers/net/ethernet/3com/3c515.c
> @@ -22,7 +22,6 @@
>
> */
>
> -#include <linux/vermagic.h>
> #define DRV_NAME "3c515"
>
> #define CORKSCREW 1
> diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
> index 2db42211329f..a64191fc2af9 100644
> --- a/drivers/net/ethernet/adaptec/starfire.c
> +++ b/drivers/net/ethernet/adaptec/starfire.c
> @@ -45,7 +45,6 @@
> #include <asm/processor.h> /* Processor type for cache alignment. */
> #include <linux/uaccess.h>
> #include <asm/io.h>
> -#include <linux/vermagic.h>
>
> /*
> * The current frame processor firmware fails to checksum a fragment
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
> index 588c62e9add7..3ed150512091 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
> @@ -6,7 +6,7 @@
> #include <linux/module.h>
> #include <linux/netdevice.h>
> #include <linux/utsname.h>
> -#include <linux/vermagic.h>
> +#include <generated/utsrelease.h>
>
> #include "ionic.h"
> #include "ionic_bus.h"
> diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c
> index 65c23ef6408d..b3c05ff05783 100644
> --- a/drivers/power/supply/test_power.c
> +++ b/drivers/power/supply/test_power.c
> @@ -16,7 +16,7 @@
> #include <linux/power_supply.h>
> #include <linux/errno.h>
> #include <linux/delay.h>
> -#include <linux/vermagic.h>
> +#include <generated/utsrelease.h>
>
> enum test_power_id {
> TEST_AC,
> diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
> index 89d0b1827aaf..d3cb5a49a0ce 100644
> --- a/net/ethtool/ioctl.c
> +++ b/net/ethtool/ioctl.c
> @@ -17,7 +17,6 @@
> #include <linux/phy.h>
> #include <linux/bitops.h>
> #include <linux/uaccess.h>
> -#include <linux/vermagic.h>
> #include <linux/vmalloc.h>
> #include <linux/sfp.h>
> #include <linux/slab.h>
> @@ -28,7 +27,7 @@
> #include <net/xdp_sock.h>
> #include <net/flow_offload.h>
> #include <linux/ethtool_netlink.h>
> -
> +#include <generated/utsrelease.h>
> #include "common.h"
>
> /*
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header
2020-04-14 17:26 ` Leon Romanovsky
@ 2020-04-14 17:44 ` Borislav Petkov
2020-04-14 17:54 ` Leon Romanovsky
0 siblings, 1 reply; 9+ messages in thread
From: Borislav Petkov @ 2020-04-14 17:44 UTC (permalink / raw)
To: Leon Romanovsky
Cc: David S . Miller, Jakub Kicinski, Andy Gospodarek, Ion Badulescu,
Jay Vosburgh, linux-pm, netdev, Pensando Drivers,
Sebastian Reichel, Shannon Nelson, Veaceslav Falico
On Tue, Apr 14, 2020 at 08:26:04PM +0300, Leon Romanovsky wrote:
> I personally don't use such notation and rely on the submission flow.
>
> The patch has two authors both written in SOBs and it will be visible
> in the git history that those SOBs are not maintainers additions.
A lonely SOB doesn't explain what the involvement of the person is. It
is even documented:
Documentation/process/submitting-patches.rst
Section 12) When to use Acked-by:, Cc:, and Co-developed-by:
I guess that is the maintainer of the respective tree's call in the end.
> Can you please reply to the original patch with extra tags you want,
> so b4 and patchworks will pick them without me resending the patches?
Ok.
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header
2020-04-14 15:57 ` [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header Leon Romanovsky
` (2 preceding siblings ...)
2020-04-14 17:32 ` Shannon Nelson
@ 2020-04-14 17:45 ` Borislav Petkov
3 siblings, 0 replies; 9+ messages in thread
From: Borislav Petkov @ 2020-04-14 17:45 UTC (permalink / raw)
To: Leon Romanovsky
Cc: David S . Miller, Jakub Kicinski, Leon Romanovsky,
Andy Gospodarek, Ion Badulescu, Jay Vosburgh, linux-pm, netdev,
Pensando Drivers, Sebastian Reichel, Shannon Nelson,
Veaceslav Falico
On Tue, Apr 14, 2020 at 06:57:29PM +0300, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
>
> Get rid of linux/vermagic.h includes, so that MODULE_ARCH_VERMAGIC from
> the arch header arch/x86/include/asm/module.h won't be redefined.
>
> 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>
Co-developed-by: Borislav Petkov <bp@suse.de>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
> drivers/net/bonding/bonding_priv.h | 2 +-
> drivers/net/ethernet/3com/3c509.c | 1 -
> drivers/net/ethernet/3com/3c515.c | 1 -
> drivers/net/ethernet/adaptec/starfire.c | 1 -
> drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 +-
> drivers/power/supply/test_power.c | 2 +-
> net/ethtool/ioctl.c | 3 +--
> 7 files changed, 4 insertions(+), 8 deletions(-)
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header
2020-04-14 17:44 ` Borislav Petkov
@ 2020-04-14 17:54 ` Leon Romanovsky
0 siblings, 0 replies; 9+ messages in thread
From: Leon Romanovsky @ 2020-04-14 17:54 UTC (permalink / raw)
To: Borislav Petkov
Cc: David S . Miller, Jakub Kicinski, Andy Gospodarek, Ion Badulescu,
Jay Vosburgh, linux-pm, netdev, Pensando Drivers,
Sebastian Reichel, Shannon Nelson, Veaceslav Falico
On Tue, Apr 14, 2020 at 07:44:32PM +0200, Borislav Petkov wrote:
> On Tue, Apr 14, 2020 at 08:26:04PM +0300, Leon Romanovsky wrote:
> > I personally don't use such notation and rely on the submission flow.
> >
> > The patch has two authors both written in SOBs and it will be visible
> > in the git history that those SOBs are not maintainers additions.
>
> A lonely SOB doesn't explain what the involvement of the person is. It
> is even documented:
>
> Documentation/process/submitting-patches.rst
>
> Section 12) When to use Acked-by:, Cc:, and Co-developed-by:
I know, and never liked that "Co-developed-by" tag and prefer
to be in old school camp who uses SOB to mark the author. :)
>
> I guess that is the maintainer of the respective tree's call in the end.
>
> > Can you please reply to the original patch with extra tags you want,
> > so b4 and patchworks will pick them without me resending the patches?
>
> Ok.
Thanks
>
> --
> Regards/Gruss,
> Boris.
>
> SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-04-14 17:54 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-14 15:57 [PATCH net-next 0/4] Remove vermagic header from global include folder Leon Romanovsky
2020-04-14 15:57 ` [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header Leon Romanovsky
2020-04-14 16:00 ` Borislav Petkov
2020-04-14 17:26 ` Leon Romanovsky
2020-04-14 17:44 ` Borislav Petkov
2020-04-14 17:54 ` Leon Romanovsky
2020-04-14 17:07 ` Sebastian Reichel
2020-04-14 17:32 ` Shannon Nelson
2020-04-14 17:45 ` Borislav Petkov
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).