Merge tag 'spdx-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
Pull SPDX updates from Greg KH:
"Here are some SPDX-specific changes for 5.10-rc1.
They include:
- driver fixes to make spdxcheck.pl work properly
- add GFDL licenses as "deprecated" but required due to some of our
documentation using them
- add Zlib license as "deprecated" but required because we have code
with this license in the tree.
- convert some drivers to have SPDX identifiers that previously
didn't have them.
All have been in linux-next for a very long time with no reported
issues"
* tag 'spdx-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
scripts/spdxcheck.py: handle license identifiers in XML comments
net/mlx5: IPsec: make spdxcheck.py happy
LICENSES/deprecated: add Zlib license text
LICENSE: add GFDL deprecated licenses
net/qla3xxx: Convert to SPDX license identifiers
net/qlge: Convert to SPDX license identifiers
net/qlcnic: Convert to SPDX license identifiers
scsi/qla2xxx: Convert to SPDX license identifiers
scsi/qla4xxx: Convert to SPDX license identifiers
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/*
|
||||
* QLogic QLA3xxx NIC HBA Driver
|
||||
* Copyright (c) 2003-2006 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qla3xxx for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
/*
|
||||
* QLogic QLA3xxx NIC HBA Driver
|
||||
* Copyright (c) 2003-2006 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qla3xxx for copyright and licensing details.
|
||||
*/
|
||||
#ifndef _QLA3XXX_H_
|
||||
#define _QLA3XXX_H_
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#ifndef _QLCNIC_H_
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <linux/if_vlan.h>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#ifndef __QLCNIC_83XX_HW_H
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include "qlcnic_sriov.h"
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include "qlcnic.h"
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include "qlcnic.h"
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#ifndef __QLCNIC_DCBX_H
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#ifndef __QLCNIC_HDR_H_
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <linux/slab.h>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#ifndef __QLCNIC_HW_H
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include "qlcnic.h"
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <linux/netdevice.h>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <linux/vmalloc.h>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <net/ip.h>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#ifndef _QLCNIC_83XX_SRIOV_H_
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* QLogic qlcnic NIC Driver
|
||||
* Copyright (c) 2009-2013 QLogic Corporation
|
||||
*
|
||||
* See LICENSE.qlcnic for copyright and licensing details.
|
||||
*/
|
||||
|
||||
#include <linux/slab.h>
|
||||
|
||||
Reference in New Issue
Block a user