Commit e641577e authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'spdx-conversion-for-bonding-8390-and-i825xx-drivers' 

Bagas Sanjaya says:

====================
SPDX conversion for bonding, 8390, and i825xx drivers

This series is SPDX conversion for bonding, 8390, and i825xx driver
subsystems. It is splitted from v2 of my SPDX conversion series in
response to Didi's GPL full name fixes [1] to make it easily
digestible.

The conversion in this series is divided by each subsystem and by
license type.

[1]: https://lore.kernel.org/linux-spdx/20230512100620.36807-1-bagasdotme@gmail.com/
====================

Link: https://lore.kernel.org/r/20230515060714.621952-1-bagasdotme@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 8b334851 4f693a8f

drivers/net/bonding/bond_main.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-1.0+

/*

 * originally based on the dummy device.

 *

 * Copyright 1999, Thomas Davis, tadavis@lbl.gov.

 * Licensed under the GPL. Based on dummy.c, and eql.c devices.

 * Based on dummy.c, and eql.c devices.

 *

 * bonding.c: an Ethernet Bonding driver

 *

drivers/net/bonding/bonding_priv.h

+1 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-1.0+ */

/*

 * Bond several ethernet interfaces into a Cisco, running 'Etherchannel'.

 *
@@ -7,9 +8,6 @@ 
 * BUT, I'm the one who modified it for ethernet, so:

 * (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov

 *

 *	This software may be used and distributed according to the terms

 *	of the GNU Public License, incorporated herein by reference.

 *

 */



#ifndef _BONDING_PRIV_H

drivers/net/ethernet/8390/8390.h

+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-1.0+ */



/* Generic NS8390 register definitions. */



/* This file is part of Donald Becker's 8390 drivers, and is distributed

drivers/net/ethernet/8390/apne.c

+1 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Amiga Linux/68k 8390 based PCMCIA Ethernet Driver for the Amiga 1200

 *
@@ -19,12 +20,6 @@ 
 *

 * ----------------------------------------------------------------------------

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file COPYING in the main directory of the Linux

 * distribution for more details.

 *

 * ----------------------------------------------------------------------------

 *

 */

drivers/net/ethernet/8390/axnet_cs.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-1.0+



/*======================================================================



    A PCMCIA ethernet driver for Asix AX88190-based cards
@@ -17,9 +19,7 @@ 


    Written 1992,1993 by Donald Becker.

    Copyright 1993 United States Government as represented by the

    Director, National Security Agency.  This software may be used and

    distributed according to the terms of the GNU General Public License,

    incorporated herein by reference.

    Director, National Security Agency.

    Donald Becker may be reached at becker@scyld.com



======================================================================*/