mbox series

[net-next,0/4] Remove vermagic header from global include folder

Message ID 20200414155732.1236944-1-leon@kernel.org
Headers show
Series Remove vermagic header from global include folder | expand

Message

Leon Romanovsky April 14, 2020, 3:57 p.m. UTC
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

Comments

Leon Romanovsky April 14, 2020, 6:41 p.m. UTC | #1
On Tue, Apr 14, 2020 at 06:03:50PM +0200, Borislav Petkov wrote:
> On Tue, Apr 14, 2020 at 06:57:32PM +0300, Leon Romanovsky wrote:
> > From: Leon Romanovsky <leonro@mellanox.com>
> >
> > 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:
>
> Acked-by: Borislav Petkov <bp@suse.de>

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.

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

<...>


>
> Thx.
>
> --
> Regards/Gruss,
>     Boris.
>
> SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg