[net-next,1/4] drivers: Remove inclusion of vermagic header

Message ID	20200414155732.1236944-2-leon@kernel.org
State	Deferred
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Leon Romanovsky <leon@kernel.org> To: "David S . Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org> Cc: Leon Romanovsky <leonro@mellanox.com>, Andy Gospodarek <andy@greyhouse.net>, Borislav Petkov <bp@suse.de>, Ion Badulescu <ionut@badula.org>, Jay Vosburgh <j.vosburgh@gmail.com>, linux-pm@vger.kernel.org, netdev@vger.kernel.org, Pensando Drivers <drivers@pensando.io>, Sebastian Reichel <sre@kernel.org>, Shannon Nelson <snelson@pensando.io>, Veaceslav Falico <vfalico@gmail.com> Subject: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header Date: Tue, 14 Apr 2020 18:57:29 +0300 Message-Id: <20200414155732.1236944-2-leon@kernel.org> In-Reply-To: <20200414155732.1236944-1-leon@kernel.org> References: <20200414155732.1236944-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	Remove vermagic header from global include folder \| expand [net-next,0/4] Remove vermagic header from global include folder [net-next,1/4] drivers: Remove inclusion of vermagic header [net-next,2/4] net/hns: Remove custom driver version in favour of global one [net-next,3/4] net/nfp: Update driver to use global kernel version

Leon Romanovsky April 14, 2020, 3:57 p.m. UTC

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(-)

Borislav Petkov April 14, 2020, 4 p.m. UTC | #1

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.

Sebastian Reichel April 14, 2020, 5:07 p.m. UTC | #2

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
>

Leon Romanovsky April 14, 2020, 5:26 p.m. UTC | #3

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

Shannon Nelson April 14, 2020, 5:32 p.m. UTC | #4

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"
>   
>   /*

Borislav Petkov April 14, 2020, 5:44 p.m. UTC | #5

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.

Borislav Petkov April 14, 2020, 5:45 p.m. UTC | #6

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(-)

Leon Romanovsky April 14, 2020, 5:54 p.m. UTC | #7

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

[net-next,1/4] drivers: Remove inclusion of vermagic header

Commit Message

Comments

Patch