tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

net: update NXP copyright text

NXP Legal insists that the following are not fine:

- Saying "NXP Semiconductors" instead of "NXP", since the company's
registered name is "NXP"

- Putting a "(c)" sign in the copyright string

- Putting a comma in the copyright string

The only accepted copyright string format is "Copyright <year-range> NXP".

This patch changes the copyright headers in the networking files that
were sent by me, or derived from code sent by me.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Vladimir Oltean and committed by
David S. Miller 3c9cfb52 e8f69b16

+24 -24
+1 -1
drivers/net/dsa/ocelot/felix.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /* Copyright 2019-2021 NXP Semiconductors 2 + /* Copyright 2019-2021 NXP 3 3 * 4 4 * This is an umbrella module for all network switches that are 5 5 * register-compatible with Ocelot and that perform I/O to their host CPU
+1 -1
drivers/net/dsa/ocelot/felix.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* Copyright 2019 NXP Semiconductors 2 + /* Copyright 2019 NXP 3 3 */ 4 4 #ifndef _MSCC_FELIX_H 5 5 #define _MSCC_FELIX_H
+1 -1
drivers/net/dsa/ocelot/felix_vsc9959.c
··· 1 1 // SPDX-License-Identifier: (GPL-2.0 OR MIT) 2 2 /* Copyright 2017 Microsemi Corporation 3 - * Copyright 2018-2019 NXP Semiconductors 3 + * Copyright 2018-2019 NXP 4 4 */ 5 5 #include <linux/fsl/enetc_mdio.h> 6 6 #include <soc/mscc/ocelot_qsys.h>
+1 -1
drivers/net/dsa/sja1105/sja1105_clocking.c
··· 1 1 // SPDX-License-Identifier: BSD-3-Clause 2 - /* Copyright (c) 2016-2018, NXP Semiconductors 2 + /* Copyright 2016-2018 NXP 3 3 * Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com> 4 4 */ 5 5 #include <linux/packing.h>
+1 -1
drivers/net/dsa/sja1105/sja1105_devlink.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com> 3 - * Copyright 2020 NXP Semiconductors 3 + * Copyright 2020 NXP 4 4 */ 5 5 #include "sja1105.h" 6 6
+1 -1
drivers/net/dsa/sja1105/sja1105_flower.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /* Copyright 2020, NXP Semiconductors 2 + /* Copyright 2020 NXP 3 3 */ 4 4 #include "sja1105.h" 5 5 #include "sja1105_vl.h"
+1 -1
drivers/net/dsa/sja1105/sja1105_mdio.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /* Copyright 2021, NXP Semiconductors 2 + /* Copyright 2021 NXP 3 3 */ 4 4 #include <linux/pcs/pcs-xpcs.h> 5 5 #include <linux/of_mdio.h>
+1 -1
drivers/net/dsa/sja1105/sja1105_spi.c
··· 1 1 // SPDX-License-Identifier: BSD-3-Clause 2 - /* Copyright (c) 2016-2018, NXP Semiconductors 2 + /* Copyright 2016-2018 NXP 3 3 * Copyright (c) 2018, Sensor-Technik Wiedemann GmbH 4 4 * Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com> 5 5 */
+1 -1
drivers/net/dsa/sja1105/sja1105_static_config.c
··· 1 1 // SPDX-License-Identifier: BSD-3-Clause 2 - /* Copyright (c) 2016-2018, NXP Semiconductors 2 + /* Copyright 2016-2018 NXP 3 3 * Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com> 4 4 */ 5 5 #include "sja1105_static_config.h"
+1 -1
drivers/net/dsa/sja1105/sja1105_static_config.h
··· 1 1 /* SPDX-License-Identifier: BSD-3-Clause */ 2 - /* Copyright (c) 2016-2018, NXP Semiconductors 2 + /* Copyright 2016-2018 NXP 3 3 * Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com> 4 4 */ 5 5 #ifndef _SJA1105_STATIC_CONFIG_H
+1 -1
drivers/net/dsa/sja1105/sja1105_vl.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /* Copyright 2020, NXP Semiconductors 2 + /* Copyright 2020 NXP 3 3 */ 4 4 #include <net/tc_act/tc_gate.h> 5 5 #include <linux/dsa/8021q.h>
+1 -1
drivers/net/dsa/sja1105/sja1105_vl.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* Copyright 2020, NXP Semiconductors 2 + /* Copyright 2020 NXP 3 3 */ 4 4 #ifndef _SJA1105_VL_H 5 5 #define _SJA1105_VL_H
+1 -1
drivers/net/ethernet/freescale/enetc/enetc_ierb.c
··· 1 1 // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) 2 - /* Copyright 2021 NXP Semiconductors 2 + /* Copyright 2021 NXP 3 3 * 4 4 * The Integrated Endpoint Register Block (IERB) is configured by pre-boot 5 5 * software and is supposed to be to ENETC what a NVRAM is to a 'real' PCIe
+1 -1
drivers/net/ethernet/freescale/enetc/enetc_ierb.h
··· 1 1 /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ 2 - /* Copyright 2021 NXP Semiconductors */ 2 + /* Copyright 2021 NXP */ 3 3 4 4 #include <linux/pci.h> 5 5 #include <linux/platform_device.h>
+1 -1
drivers/net/ethernet/mscc/ocelot_devlink.c
··· 1 1 // SPDX-License-Identifier: (GPL-2.0 OR MIT) 2 - /* Copyright 2020-2021 NXP Semiconductors 2 + /* Copyright 2020-2021 NXP 3 3 */ 4 4 #include <net/devlink.h> 5 5 #include "ocelot.h"
+1 -1
drivers/net/ethernet/mscc/ocelot_mrp.c
··· 2 2 /* Microsemi Ocelot Switch driver 3 3 * 4 4 * Copyright (c) 2017, 2019 Microsemi Corporation 5 - * Copyright 2020-2021 NXP Semiconductors 5 + * Copyright 2020-2021 NXP 6 6 */ 7 7 8 8 #include <linux/if_bridge.h>
+1 -1
drivers/net/ethernet/mscc/ocelot_net.c
··· 5 5 * mscc_ocelot_switch_lib. 6 6 * 7 7 * Copyright (c) 2017, 2019 Microsemi Corporation 8 - * Copyright 2020-2021 NXP Semiconductors 8 + * Copyright 2020-2021 NXP 9 9 */ 10 10 11 11 #include <linux/if_bridge.h>
+1 -1
drivers/net/pcs/pcs-xpcs-nxp.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /* Copyright 2021 NXP Semiconductors 2 + /* Copyright 2021 NXP 3 3 */ 4 4 #include <linux/pcs/pcs-xpcs.h> 5 5 #include "pcs-xpcs.h"
+1 -1
include/linux/dsa/ocelot.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 2 - * Copyright 2019-2021 NXP Semiconductors 2 + * Copyright 2019-2021 NXP 3 3 */ 4 4 5 5 #ifndef _NET_DSA_TAG_OCELOT_H
+1 -1
include/linux/packing.h
··· 1 1 /* SPDX-License-Identifier: BSD-3-Clause 2 - * Copyright (c) 2016-2018, NXP Semiconductors 2 + * Copyright 2016-2018 NXP 3 3 * Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com> 4 4 */ 5 5 #ifndef _LINUX_PACKING_H
+1 -1
lib/packing.c
··· 1 1 // SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 2 - /* Copyright (c) 2016-2018, NXP Semiconductors 2 + /* Copyright 2016-2018 NXP 3 3 * Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com> 4 4 */ 5 5 #include <linux/packing.h>
+1 -1
net/dsa/tag_ocelot.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /* Copyright 2019 NXP Semiconductors 2 + /* Copyright 2019 NXP 3 3 */ 4 4 #include <linux/dsa/ocelot.h> 5 5 #include <soc/mscc/ocelot.h>
+1 -1
net/dsa/tag_ocelot_8021q.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /* Copyright 2020-2021 NXP Semiconductors 2 + /* Copyright 2020-2021 NXP 3 3 * 4 4 * An implementation of the software-defined tag_8021q.c tagger format, which 5 5 * also preserves full functionality under a vlan_filtering bridge. It does
+1 -1
tools/testing/selftests/drivers/net/ocelot/tc_flower_chains.sh
··· 1 1 #!/bin/bash 2 2 # SPDX-License-Identifier: GPL-2.0 3 - # Copyright 2020 NXP Semiconductors 3 + # Copyright 2020 NXP 4 4 5 5 WAIT_TIME=1 6 6 NUM_NETIFS=4