Commit 59211053 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'vermagic-non-global' 

Leon Romanovsky says:

====================
Remove vermagic header from global include folder

Changelog:
v2:
 * Changed the implementation of patch #4 to be like Masahiro wants.
I personally don't like this implementation and changing it just to move forward
this this patchset.
v1:
https://lore.kernel.org/lkml/20200415133648.1306956-1-leon@kernel.org
 * Added tags
 * Updated patch #4 with test results
 * Changed scripts/mod/modpost.c to create inclusion of vermagic.h
   from kernel folder and not from general include/linux. This is
   needed to generate *.mod.c files, while building modules.
v0:
https://lore.kernel.org/lkml/20200414155732.1236944-1-leon@kernel.org

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


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b6246f4d 51161bfc

drivers/net/bonding/bonding_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


*/



#include <linux/vermagic.h>

#define DRV_NAME		"3c515"



#define CORKSCREW 1

drivers/net/ethernet/adaptec/starfire.c

+0 −1
Original line number Diff line number Diff line
@@ -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/hisilicon/hns3/hns3_enet.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE