Skip to contentSkip to conversation

Remove vermagic header from global include folder

PATCH In review Leon Romanovsky 6 participants 16 messages Apr 14, 2020 – Apr 15, 2020

Subsystems (11)
lore
Share & tools
lore
#0 lore raw

cover Remove vermagic header from global include folder

From: Leon Romanovsky <[email protected]>

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/[email protected]
[2] https://lore.kernel.org/lkml/[email protected]

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

#1 lore raw

PATCH 1/4 drivers: Remove inclusion of vermagic header

From: Leon Romanovsky <[email protected]>

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")
---
 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(-)
drivers/net/bonding/bonding_priv.h +1 -1
index 45b77bc8c7b3..48cdf3a49a7d 100644
@@ -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"
drivers/net/ethernet/3com/3c509.c +0 -1
index b762176a1406..139d0120f511 100644
@@ -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>
drivers/net/ethernet/3com/3c515.c +0 -1
index 90312fcd6319..47b4215bb93b 100644
@@ -22,7 +22,6 @@
 
 */
 
-#include <linux/vermagic.h>
 #define DRV_NAME		"3c515"
 
 #define CORKSCREW 1
drivers/net/ethernet/adaptec/starfire.c +0 -1
index 2db42211329f..a64191fc2af9 100644
@@ -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
drivers/net/ethernet/pensando/ionic/ionic_main.c +1 -1
index 588c62e9add7..3ed150512091 100644
@@ -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"
drivers/power/supply/test_power.c +1 -1
index 65c23ef6408d..b3c05ff05783 100644
@@ -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,
net/ethtool/ioctl.c +1 -2
index 89d0b1827aaf..d3cb5a49a0ce 100644
@@ -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"
 
 /*
Signature · 1 line
2.25.2
#12 lore raw

PATCH 4/4 kernel/module: Hide vermagic header file from general use

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

VERMAGIC* definitions are not supposed to be used by the drivers, see this [1] bug report, so simply move this header file to be visible to kernel/* files only.

[1] https://lore.kernel.org/lkml/[email protected]

---
 kernel/module.c                      | 2 +-
 {include/linux => kernel}/vermagic.h | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {include/linux => kernel}/vermagic.h (100%)
kernel/module.c +1 -1
index 3447f3b74870..fce06095d341 100644
@@ -29,7 +29,6 @@
 #include <linux/moduleparam.h>
 #include <linux/errno.h>
 #include <linux/err.h>
-#include <linux/vermagic.h>
 #include <linux/notifier.h>
 #include <linux/sched.h>
 #include <linux/device.h>
@@ -55,6 +54,7 @@
 #include <linux/audit.h>
 #include <uapi/linux/module.h>
 #include "module-internal.h"
+#include "vermagic.h"
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/module.h>
kernel/vermagic.h renamed from include/linux/vermagic.h +0 -0
similarity index 100%
rename from include/linux/vermagic.h
rename to kernel/vermagic.h
Signature · 1 line
2.25.2
#10 lore raw

PATCH 3/4 net/nfp: Update driver to use global kernel version

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Change nfp driver to use globally defined kernel version.

---
 drivers/net/ethernet/netronome/nfp/nfp_main.c        | 3 ---
 drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 --
 2 files changed, 5 deletions(-)
drivers/net/ethernet/netronome/nfp/nfp_main.c +0 -3
index 4d282fc56009..7ff2ccbd43b0 100644
@@ -14,7 +14,6 @@
 #include <linux/mutex.h>
 #include <linux/pci.h>
 #include <linux/firmware.h>
-#include <linux/vermagic.h>
 #include <linux/vmalloc.h>
 #include <net/devlink.h>
 
@@ -31,7 +30,6 @@
 #include "nfp_net.h"
 
 static const char nfp_driver_name[] = "nfp";
-const char nfp_driver_version[] = VERMAGIC_STRING;
 
 static const struct pci_device_id nfp_pci_device_ids[] = {
 	{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000,
@@ -920,4 +918,3 @@ MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_1x10_1x25.nffw");
 MODULE_AUTHOR("Netronome Systems <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("The Netronome Flow Processor (NFP) driver.");
-MODULE_VERSION(UTS_RELEASE);
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +0 -2
index 2779f1526d1e..a5aa3219d112 100644
@@ -203,8 +203,6 @@ nfp_get_drvinfo(struct nfp_app *app, struct pci_dev *pdev,
 	char nsp_version[ETHTOOL_FWVERS_LEN] = {};
 
 	strlcpy(drvinfo->driver, pdev->driver->name, sizeof(drvinfo->driver));
-	strlcpy(drvinfo->version, nfp_driver_version, sizeof(drvinfo->version));
-
 	nfp_net_get_nspinfo(app, nsp_version);
 	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
 		 "%s %s %s %s", vnic_version, nsp_version,
Signature · 1 line
2.25.2
#9 lore raw

PATCH 2/4 net/hns: Remove custom driver version in favour of global one

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Use globally defined kernel version instead of custom driver variant.

---
 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 ----
 3 files changed, 11 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +0 -3
index da98fd7c8eca..ac3a48a24d86 100644
@@ -15,7 +15,6 @@
 #include <linux/aer.h>
 #include <linux/skbuff.h>
 #include <linux/sctp.h>
-#include <linux/vermagic.h>
 #include <net/gre.h>
 #include <net/ip6_checksum.h>
 #include <net/pkt_cls.h>
@@ -44,7 +43,6 @@ static void hns3_clear_all_ring(struct hnae3_handle *h, bool force);
 static void hns3_remove_hw_addr(struct net_device *netdev);
 
 static const char hns3_driver_name[] = "hns3";
-const char hns3_driver_version[] = VERMAGIC_STRING;
 static const char hns3_driver_string[] =
 			"Hisilicon Ethernet Network Driver for Hip08 Family";
 static const char hns3_copyright[] = "Copyright (c) 2017 Huawei Corporation.";
@@ -4765,4 +4763,3 @@ MODULE_DESCRIPTION("HNS3: Hisilicon Ethernet Driver");
 MODULE_AUTHOR("Huawei Tech. Co., Ltd.");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("pci:hns-nic");
-MODULE_VERSION(HNS3_MOD_VERSION);
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +0 -4
index abefd7a179f7..4b3f0abf0715 100644
@@ -8,10 +8,6 @@
 
 #include "hnae3.h"
 
-#define HNS3_MOD_VERSION "1.0"
-
-extern const char hns3_driver_version[];
-
 enum hns3_nic_state {
 	HNS3_NIC_STATE_TESTING,
 	HNS3_NIC_STATE_RESETTING,
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +0 -4
index 28b81f24afa1..6a0734be4a1a 100644
@@ -546,10 +546,6 @@ static void hns3_get_drvinfo(struct net_device *netdev,
 		return;
 	}
 
-	strncpy(drvinfo->version, hns3_driver_version,
-		sizeof(drvinfo->version));
-	drvinfo->version[sizeof(drvinfo->version) - 1] = '\0';
-
 	strncpy(drvinfo->driver, h->pdev->driver->name,
 		sizeof(drvinfo->driver));
 	drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0';
Signature · 1 line
2.25.2
#2 lore raw

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

In reply to Leon Romanovsky
Quoted 17 lines · Leon Romanovsky

From: Leon Romanovsky <[email protected]>

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

Quoted 2 lines
Fixes 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers")

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.

Signature · 4 lines
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
Acked-by on v1 4/4
#13 lore raw

Re: [PATCH net-next 4/4] kernel/module: Hide vermagic header file from general use

In reply to Leon Romanovsky
Quoted 3 lines · Leon Romanovsky

From: Leon Romanovsky <[email protected]>

VERMAGIC* definitions are not supposed to be used by the drivers,

Yeah, this was only me conjecturing here. But yes, if people agree, this would be one way to do it.

In any case and FWIW, series looks ok to me:

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
#6 lore raw

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

In reply to Leon Romanovsky

Hi,

Quoted 17 lines · Leon Romanovsky

From: Leon Romanovsky <[email protected]>

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

Quoted 4 lines
Fixes 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers")

---

# for drivers/power/supply/test_power.c
Acked-by: Sebastian Reichel <[email protected]>

-- Sebastian

Quoted 108 lines
 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(-)
drivers/net/bonding/bonding_priv.h +1 -1
index 45b77bc8c7b3..48cdf3a49a7d 100644
@@ -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"
drivers/net/ethernet/3com/3c509.c +0 -1
index b762176a1406..139d0120f511 100644
@@ -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>
drivers/net/ethernet/3com/3c515.c +0 -1
index 90312fcd6319..47b4215bb93b 100644
@@ -22,7 +22,6 @@
 
 */
 
-#include <linux/vermagic.h>
 #define DRV_NAME		"3c515"
 
 #define CORKSCREW 1
drivers/net/ethernet/adaptec/starfire.c +0 -1
index 2db42211329f..a64191fc2af9 100644
@@ -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
drivers/net/ethernet/pensando/ionic/ionic_main.c +1 -1
index 588c62e9add7..3ed150512091 100644
@@ -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"
drivers/power/supply/test_power.c +1 -1
index 65c23ef6408d..b3c05ff05783 100644
@@ -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,
net/ethtool/ioctl.c +1 -2
index 89d0b1827aaf..d3cb5a49a0ce 100644
@@ -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"
 
 /*
Signature · 1 line
2.25.2
#3 lore raw

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

In reply to Borislav Petkov
Quoted 21 lines · Borislav Petkov
Quoted 17 lines · Leon Romanovsky

From: Leon Romanovsky <[email protected]>

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

Quoted 2 lines
Fixes 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers")
Quoted 6 lines

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

Quoted 8 lines

Thx.

--
Regards/Gruss,
Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Acked-by on v1 1/4
#7 lore raw

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

In reply to Leon Romanovsky
Quoted 17 lines · Leon Romanovsky

From: Leon Romanovsky <[email protected]>

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

Quoted 3 lines
Fixes 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers")

for ionic driver:

Quoted 106 lines
---
  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(-)
drivers/net/bonding/bonding_priv.h +1 -1
index 45b77bc8c7b3..48cdf3a49a7d 100644
@@ -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"
drivers/net/ethernet/3com/3c509.c +0 -1
index b762176a1406..139d0120f511 100644
@@ -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>
drivers/net/ethernet/3com/3c515.c +0 -1
index 90312fcd6319..47b4215bb93b 100644
@@ -22,7 +22,6 @@
 
  */
 
-#include <linux/vermagic.h>
  #define DRV_NAME		"3c515"
 
  #define CORKSCREW 1
drivers/net/ethernet/adaptec/starfire.c +0 -1
index 2db42211329f..a64191fc2af9 100644
@@ -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
drivers/net/ethernet/pensando/ionic/ionic_main.c +1 -1
index 588c62e9add7..3ed150512091 100644
@@ -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"
drivers/power/supply/test_power.c +1 -1
index 65c23ef6408d..b3c05ff05783 100644
@@ -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,
net/ethtool/ioctl.c +1 -2
index 89d0b1827aaf..d3cb5a49a0ce 100644
@@ -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"
 
  /*
#4 lore raw

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

In reply to Leon Romanovsky
Quoted 4 lines · Leon Romanovsky

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.

Quoted 2 lines

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.

Signature · 4 lines
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
#8 lore raw

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

In reply to Leon Romanovsky
Quoted 17 lines · Leon Romanovsky

From: Leon Romanovsky <[email protected]>

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

Quoted 2 lines
Fixes 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers")
Quoted 10 lines
---
 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(-)
Signature · 4 lines
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
#5 lore raw

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

In reply to Borislav Petkov
Quoted 6 lines · Borislav Petkov
Quoted 4 lines · Leon Romanovsky

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.

Quoted 6 lines

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. :)

Quoted 7 lines

I guess that is the maintainer of the respective tree's call in the end.

Quoted 2 lines

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

Quoted 6 lines

--
Regards/Gruss,
Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

#14 lore raw

Re: [PATCH net-next 4/4] kernel/module: Hide vermagic header file from general use

In reply to Borislav Petkov
Quoted 11 lines · Borislav Petkov
Quoted 3 lines · Leon Romanovsky

From: Leon Romanovsky <[email protected]>

VERMAGIC* definitions are not supposed to be used by the drivers,

Yeah, this was only me conjecturing here. But yes, if people agree, this would be one way to do it.

In any case and FWIW, series looks ok to me:

Thanks, finally kbuild slap me to the face.
There is a need to change scripts/mod/modpost.c too and find the reason why I didn't get any compilation errors.

<...>

Quoted 1 line
Quoted 1 line

drivers/gpio/gpio-aspeed.mod.c:3:10: fatal error: linux/vermagic.h: No such file or directory

3 | #include <linux/vermagic.h>
| ^~~~~~~~~~~~~~~~~~
compilation terminated.

<...>

Quoted 8 lines

Thx.

--
Regards/Gruss,
Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

maintainer Acked-by on v1 3/4
#11 lore raw

Re: [PATCH net-next 3/4] net/nfp: Update driver to use global kernel version

In reply to Leon Romanovsky
Quoted 6 lines · On Tue, 14 Apr 2020 18:57:31 +0300 Leon Romanovsky wrote:

From: Leon Romanovsky <[email protected]>

Change nfp driver to use globally defined kernel version.

#15 lore raw

Re: [PATCH net-next 4/4] kernel/module: Hide vermagic header file from general use

In reply to Leon Romanovsky
I love your patch! Yet something to improve:

Hi Leon,

I love your patch! Yet something to improve:

[auto build test ERROR on net-next/master]
[also build test ERROR on net/master linus/master v5.7-rc1 next-20200414] [cannot apply to jeyu/modules-next]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Leon-Romanovsky/Remove-vermagic-header-from-global-include-folder/20200415-042643
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 7f80ccfe996871ca69648efee74a60ae7ad0dcd9
config: arm-pcm027_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=9.3.0 make.cross ARCH=arm

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> drivers/rtc/rtc-pxa.mod.c:3:10: fatal error: linux/vermagic.h: No such file or directory

3 | #include <linux/vermagic.h>
| ^~~~~~~~~~~~~~~~~~
compilation terminated.

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org