Commit c1c76700 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 723c188d 58301e1c

Documentation/arm/samsung-s3c24xx/cpufreq.rst

+2 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0-only



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

S3C24XX CPUfreq support

=======================
@@ -73,4 +75,3 @@ Document Author 
---------------



Ben Dooks, Copyright 2009 Simtec Electronics
 
Licensed under GPLv2

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

+1 −3
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0-only

.. include:: <isonum.txt>



=====================
@@ -8,9 +9,6 @@ VFIO Mediated devices 
:Author: Neo Jia <cjia@nvidia.com>

:Author: Kirti Wankhede <kwankhede@nvidia.com>



This program is free software; you can redistribute it and/or modify

it under the terms of the GNU General Public License version 2 as

published by the Free Software Foundation.





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

arch/arm/boot/bootp/bootp.lds

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

/*

 *  linux/arch/arm/boot/bootp/bootp.lds

 *

 *  Copyright (C) 2000-2002 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

OUTPUT_ARCH(arm)

ENTRY(_start)

arch/arm/boot/dts/am33xx.dtsi

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

/*

 * Device Tree Source for AM33XX SoC

 *

 * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



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

arch/arm/boot/dts/am3517.dtsi

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

/*

 * Device Tree Source for am3517 SoC

 *

 * Copyright (C) 2013 Texas Instruments Incorporated - https://www.ti.com/

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



#include "omap3.dtsi"