Skip to content

Commit c1c7670

Browse files
torvaldstorvalds
committed
Merge tag 'spdx-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
Pull SPDX updates from Greg KH: "Here is the set of SPDX comment updates for 6.0-rc1. Nothing huge here, just a number of updated SPDX license tags and cleanups based on the review of a number of common patterns in GPLv2 boilerplate text. Also included in here are a few other minor updates, two USB files, and one Documentation file update to get the SPDX lines correct. All of these have been in the linux-next tree for a very long time" * tag 'spdx-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx: (28 commits) Documentation: samsung-s3c24xx: Add blank line after SPDX directive x86/crypto: Remove stray comment terminator treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_406.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_398.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_391.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_390.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_385.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_320.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_319.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_318.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_298.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_292.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_179.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 2) treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_168.RULE (part 1) treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_160.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_152.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_149.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_147.RULE treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_133.RULE ...
2 parents 723c188 + 58301e1 commit c1c7670

611 files changed

Lines changed: 722 additions & 5585 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/arm/samsung-s3c24xx/cpufreq.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0-only
2+
13
=======================
24
S3C24XX CPUfreq support
35
=======================
@@ -73,4 +75,3 @@ Document Author
7375
---------------
7476

7577
Ben Dooks, Copyright 2009 Simtec Electronics
76-
Licensed under GPLv2

‎Documentation/driver-api/vfio-mediated-device.rst‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.. SPDX-License-Identifier: GPL-2.0-only
12
.. include:: <isonum.txt>
23

34
=====================
@@ -8,9 +9,6 @@ VFIO Mediated devices
89
:Author: Neo Jia <cjia@nvidia.com>
910
:Author: Kirti Wankhede <kwankhede@nvidia.com>
1011

11-
This program is free software; you can redistribute it and/or modify
12-
it under the terms of the GNU General Public License version 2 as
13-
published by the Free Software Foundation.
1412

1513

1614
Virtual Function I/O (VFIO) Mediated devices[1]

‎arch/arm/boot/bootp/bootp.lds‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
12
/*
23
* linux/arch/arm/boot/bootp/bootp.lds
34
*
45
* Copyright (C) 2000-2002 Russell King
5-
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License version 2 as
8-
* published by the Free Software Foundation.
96
*/
107
OUTPUT_ARCH(arm)
118
ENTRY(_start)

‎arch/arm/boot/dts/am33xx.dtsi‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
12
/*
23
* Device Tree Source for AM33XX SoC
34
*
45
* Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
5-
*
6-
* This file is licensed under the terms of the GNU General Public License
7-
* version 2. This program is licensed "as is" without any warranty of any
8-
* kind, whether express or implied.
96
*/
107

118
#include <dt-bindings/bus/ti-sysc.h>

‎arch/arm/boot/dts/am3517.dtsi‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
12
/*
23
* Device Tree Source for am3517 SoC
34
*
45
* Copyright (C) 2013 Texas Instruments Incorporated - https://www.ti.com/
5-
*
6-
* This file is licensed under the terms of the GNU General Public License
7-
* version 2. This program is licensed "as is" without any warranty of any
8-
* kind, whether express or implied.
96
*/
107

118
#include "omap3.dtsi"

‎arch/arm/boot/dts/am4372.dtsi‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
12
/*
23
* Device Tree Source for AM4372 SoC
34
*
45
* Copyright (C) 2013 Texas Instruments Incorporated - https://www.ti.com/
5-
*
6-
* This file is licensed under the terms of the GNU General Public License
7-
* version 2. This program is licensed "as is" without any warranty of any
8-
* kind, whether express or implied.
96
*/
107

118
#include <dt-bindings/bus/ti-sysc.h>

‎arch/arm/boot/dts/artpec6-devboard.dts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
/*
2-
* Axis ARTPEC-6 development board.
3-
*
4-
* This file is licensed under the terms of the GNU General Public License
5-
* version 2. This program is licensed "as is" without any warranty of any
6-
* kind, whether express or implied.
7-
*/
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
// Axis ARTPEC-6 development board.
83

94
/dts-v1/;
105
#include "artpec6.dtsi"

‎arch/arm/boot/dts/bcm11351.dtsi‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
1-
/*
2-
* Copyright (C) 2012-2013 Broadcom Corporation
3-
*
4-
* This program is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU General Public License as
6-
* published by the Free Software Foundation version 2.
7-
*
8-
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
9-
* kind, whether express or implied; without even the implied warranty
10-
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11-
* GNU General Public License for more details.
12-
*/
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
// Copyright (C) 2012-2013 Broadcom Corporation
133

144
#include <dt-bindings/interrupt-controller/arm-gic.h>
155
#include <dt-bindings/interrupt-controller/irq.h>

‎arch/arm/boot/dts/bcm21664-garnet.dts‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
1-
/*
2-
* Copyright (C) 2014 Broadcom Corporation
3-
*
4-
* This program is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU General Public License as
6-
* published by the Free Software Foundation version 2.
7-
*
8-
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
9-
* kind, whether express or implied; without even the implied warranty
10-
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11-
* GNU General Public License for more details.
12-
*/
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
// Copyright (C) 2014 Broadcom Corporation
133

144
/dts-v1/;
155

‎arch/arm/boot/dts/bcm21664.dtsi‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
1-
/*
2-
* Copyright (C) 2014 Broadcom Corporation
3-
*
4-
* This program is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU General Public License as
6-
* published by the Free Software Foundation version 2.
7-
*
8-
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
9-
* kind, whether express or implied; without even the implied warranty
10-
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11-
* GNU General Public License for more details.
12-
*/
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
// Copyright (C) 2014 Broadcom Corporation
133

144
#include <dt-bindings/interrupt-controller/arm-gic.h>
155
#include <dt-bindings/interrupt-controller/irq.h>

0 commit comments

Comments
 (0)