Re: [Batch 17 patch 48/57] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 499

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 04.06.19 08:11, Thomas Gleixner wrote:
From: Thomas Gleixner tglx@xxxxxxxxxxxxx

Based on 1 normalized pattern(s):

   this work is licensed under the terms of the gnu gpl version 2 see
   the copying file in the top level directory

extracted by the scancode license scanner the SPDX license identifier

   GPL-2.0-only

has been chosen to replace the boilerplate/reference in 35 file(s).

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch17&id=7336b2e4a635
---
  arch/x86/include/asm/kvm_host.h          |    5 +----
  arch/x86/include/asm/virtext.h           |    4 +---
  arch/x86/kvm/cpuid.c                     |    5 +----
  arch/x86/kvm/debugfs.c                   |    5 +----
  arch/x86/kvm/emulate.c                   |    4 +---
  arch/x86/kvm/hyperv.c                    |    5 +----
  arch/x86/kvm/hyperv.h                    |    5 +----
  arch/x86/kvm/lapic.c                     |    4 +---
  arch/x86/kvm/mmu.c                       |    5 +----
  arch/x86/kvm/mmu_audit.c                 |    5 +----
  arch/x86/kvm/mtrr.c                      |    4 +---
  arch/x86/kvm/page_track.c                |    4 +---
  arch/x86/kvm/paging_tmpl.h               |    5 +----
  arch/x86/kvm/pmu.c                       |    5 +----
  arch/x86/kvm/pmu_amd.c                   |    4 +---
  arch/x86/kvm/svm.c                       |    5 +----
  arch/x86/kvm/vmx/pmu_intel.c             |    5 +----
  arch/x86/kvm/vmx/vmx.c                   |    5 +----
  arch/x86/kvm/x86.c                       |    5 +----
  fs/squashfs/decompressor_multi.c         |    4 +---
  fs/squashfs/decompressor_multi_percpu.c  |    4 +---
  fs/squashfs/decompressor_single.c        |    4 +---
  fs/squashfs/file_cache.c                 |    4 +---
  fs/squashfs/file_direct.c                |    4 +---
  fs/squashfs/lz4_wrapper.c                |    4 +---
  fs/squashfs/page_actor.c                 |    4 +---
  fs/squashfs/page_actor.h                 |    4 +---
  fs/userfaultfd.c                         |    4 +---
  include/linux/kvm_host.h                 |    5 +----
  mm/huge_memory.c                         |    4 +---
  mm/mmu_notifier.c                        |    4 +---
  mm/userfaultfd.c                         |    4 +---
  tools/kvm/kvm_stat/kvm_stat              |    3 +--
  tools/testing/selftests/vm/userfaultfd.c |    4 +---
  virt/kvm/kvm_main.c                      |    5 +----
  35 files changed, 35 insertions(+), 119 deletions(-)

--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * Kernel-based Virtual Machine driver for Linux
   *
   * This header defines architecture specific interfaces, x86 version
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#ifndef _ASM_X86_KVM_HOST_H
--- a/arch/x86/include/asm/virtext.h
+++ b/arch/x86/include/asm/virtext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
  /* CPU virtualization extensions handling
   *
   * This should carry the code for handling CPU virtualization extensions
@@ -8,9 +9,6 @@
   * Copyright (C) 2008, Red Hat Inc.
   *
   * Contains code from KVM, Copyright (C) 2006 Qumranet, Inc.
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
   */
  #ifndef _ASM_X86_VIRTEX_H
  #define _ASM_X86_VIRTEX_H
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Kernel-based Virtual Machine driver for Linux
   * cpuid support routines
@@ -6,10 +7,6 @@
   *
   * Copyright 2011 Red Hat, Inc. and/or its affiliates.
   * Copyright IBM Corporation, 2008
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#include <linux/kvm_host.h>
--- a/arch/x86/kvm/debugfs.c
+++ b/arch/x86/kvm/debugfs.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Kernel-based Virtual Machine driver for Linux
   *
   * Copyright 2016 Red Hat, Inc. and/or its affiliates.
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
  #include <linux/kvm_host.h>
  #include <linux/debugfs.h>
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /******************************************************************************
   * emulate.c
   *
@@ -14,9 +15,6 @@
   *   Avi Kivity <avi@xxxxxxxxxxxx>
   *   Yaniv Kamay <yaniv@xxxxxxxxxxxx>
   *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   * From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4
   */
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * KVM Microsoft Hyper-V emulation
   *
@@ -15,10 +16,6 @@
   *   Amit Shah    <amit.shah@xxxxxxxxxxxx>
   *   Ben-Ami Yassour <benami@xxxxxxxxxx>
   *   Andrey Smetanin <asmetanin@xxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#include "x86.h"
--- a/arch/x86/kvm/hyperv.h
+++ b/arch/x86/kvm/hyperv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * KVM Microsoft Hyper-V emulation
   *
@@ -15,10 +16,6 @@
   *   Amit Shah    <amit.shah@xxxxxxxxxxxx>
   *   Ben-Ami Yassour <benami@xxxxxxxxxx>
   *   Andrey Smetanin <asmetanin@xxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#ifndef __ARCH_X86_KVM_HYPERV_H__
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
   * Local APIC virtualization
@@ -13,9 +14,6 @@
   *   Yaozu (Eddie) Dong <eddie.dong@xxxxxxxxx>
   *
   * Based on Xen 3.1 code, Copyright (c) 2004, Intel Corporation.
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
   */
#include <linux/kvm_host.h>
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Kernel-based Virtual Machine driver for Linux
   *
@@ -12,10 +13,6 @@
   * Authors:
   *   Yaniv Kamay  <yaniv@xxxxxxxxxxxx>
   *   Avi Kivity   <avi@xxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#include "irq.h"
--- a/arch/x86/kvm/mmu_audit.c
+++ b/arch/x86/kvm/mmu_audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * mmu_audit.c:
   *
@@ -11,10 +12,6 @@
   *   Avi Kivity   <avi@xxxxxxxxxxxx>
   *   Marcelo Tosatti <mtosatti@xxxxxxxxxx>
   *   Xiao Guangrong <xiaoguangrong@xxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#include <linux/ratelimit.h>
--- a/arch/x86/kvm/mtrr.c
+++ b/arch/x86/kvm/mtrr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * vMTRR implementation
   *
@@ -11,9 +12,6 @@
   *   Marcelo Tosatti <mtosatti@xxxxxxxxxx>
   *   Paolo Bonzini <pbonzini@xxxxxxxxxx>
   *   Xiao Guangrong <guangrong.xiao@xxxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
   */
#include <linux/kvm_host.h>
--- a/arch/x86/kvm/page_track.c
+++ b/arch/x86/kvm/page_track.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Support KVM gust page tracking
   *
@@ -8,9 +9,6 @@
   *
   * Author:
   *   Xiao Guangrong <guangrong.xiao@xxxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
   */
#include <linux/kvm_host.h>
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * Kernel-based Virtual Machine driver for Linux
   *
@@ -12,10 +13,6 @@
   * Authors:
   *   Yaniv Kamay  <yaniv@xxxxxxxxxxxx>
   *   Avi Kivity   <avi@xxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
/*
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Kernel-based Virtual Machine -- Performance Monitoring Unit support
   *
@@ -7,10 +8,6 @@
   *   Avi Kivity   <avi@xxxxxxxxxx>
   *   Gleb Natapov <gleb@xxxxxxxxxx>
   *   Wei Huang    <wei@xxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#include <linux/types.h>
--- a/arch/x86/kvm/pmu_amd.c
+++ b/arch/x86/kvm/pmu_amd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * KVM PMU support for AMD
   *
@@ -6,9 +7,6 @@
   * Author:
   *   Wei Huang <wei@xxxxxxxxxx>
   *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   * Implementation is based on pmu_intel.c file
   */
  #include <linux/types.h>
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Kernel-based Virtual Machine driver for Linux
   *
@@ -9,10 +10,6 @@
   * Authors:
   *   Yaniv Kamay  <yaniv@xxxxxxxxxxxx>
   *   Avi Kivity   <avi@xxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#define pr_fmt(fmt) "SVM: " fmt
--- a/arch/x86/kvm/vmx/pmu_intel.c
+++ b/arch/x86/kvm/vmx/pmu_intel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * KVM PMU support for Intel CPUs
   *
@@ -6,10 +7,6 @@
   * Authors:
   *   Avi Kivity   <avi@xxxxxxxxxx>
   *   Gleb Natapov <gleb@xxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
  #include <linux/types.h>
  #include <linux/kvm_host.h>
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Kernel-based Virtual Machine driver for Linux
   *
@@ -10,10 +11,6 @@
   * Authors:
   *   Avi Kivity   <avi@xxxxxxxxxxxx>
   *   Yaniv Kamay  <yaniv@xxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#include <linux/frame.h>
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Kernel-based Virtual Machine driver for Linux
   *
@@ -13,10 +14,6 @@
   *   Yaniv Kamay  <yaniv@xxxxxxxxxxxx>
   *   Amit Shah    <amit.shah@xxxxxxxxxxxx>
   *   Ben-Ami Yassour <benami@xxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#include <linux/kvm_host.h>
--- a/fs/squashfs/decompressor_multi.c
+++ b/fs/squashfs/decompressor_multi.c
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   *  Copyright (c) 2013
   *  Minchan Kim <minchan@xxxxxxxxxx>
- *
- *  This work is licensed under the terms of the GNU GPL, version 2. See
- *  the COPYING file in the top-level directory.
   */
  #include <linux/types.h>
  #include <linux/mutex.h>
--- a/fs/squashfs/decompressor_multi_percpu.c
+++ b/fs/squashfs/decompressor_multi_percpu.c
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013
   * Phillip Lougher <phillip@xxxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
   */
#include <linux/types.h>
--- a/fs/squashfs/decompressor_single.c
+++ b/fs/squashfs/decompressor_single.c
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013
   * Phillip Lougher <phillip@xxxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
   */
#include <linux/types.h>
--- a/fs/squashfs/file_cache.c
+++ b/fs/squashfs/file_cache.c
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013
   * Phillip Lougher <phillip@xxxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
   */
#include <linux/fs.h>
--- a/fs/squashfs/file_direct.c
+++ b/fs/squashfs/file_direct.c
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013
   * Phillip Lougher <phillip@xxxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
   */
#include <linux/fs.h>
--- a/fs/squashfs/lz4_wrapper.c
+++ b/fs/squashfs/lz4_wrapper.c
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013, 2014
   * Phillip Lougher <phillip@xxxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
   */
#include <linux/buffer_head.h>
--- a/fs/squashfs/page_actor.c
+++ b/fs/squashfs/page_actor.c
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013
   * Phillip Lougher <phillip@xxxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
   */
#include <linux/kernel.h>
--- a/fs/squashfs/page_actor.h
+++ b/fs/squashfs/page_actor.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
  #ifndef PAGE_ACTOR_H
  #define PAGE_ACTOR_H
  /*
   * Copyright (c) 2013
   * Phillip Lougher <phillip@xxxxxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
   */
#ifndef CONFIG_SQUASHFS_FILE_DIRECT
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   *  fs/userfaultfd.c
   *
@@ -5,9 +6,6 @@
   *  Copyright (C) 2008-2009 Red Hat, Inc.
   *  Copyright (C) 2015  Red Hat, Inc.
   *
- *  This work is licensed under the terms of the GNU GPL, version 2. See
- *  the COPYING file in the top-level directory.
- *
   *  Some part derived from fs/eventfd.c (anon inode setup) and
   *  mm/ksm.c (mm hashing).
   */
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
  #ifndef __KVM_HOST_H
  #define __KVM_HOST_H
-/*
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- */
#include <linux/types.h>
  #include <linux/hardirq.h>
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1,8 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   *  Copyright (C) 2009  Red Hat, Inc.
- *
- *  This work is licensed under the terms of the GNU GPL, version 2. See
- *  the COPYING file in the top-level directory.
   */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
--- a/mm/mmu_notifier.c
+++ b/mm/mmu_notifier.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   *  linux/mm/mmu_notifier.c
   *
   *  Copyright (C) 2008  Qumranet, Inc.
   *  Copyright (C) 2008  SGI
   *             Christoph Lameter <cl@xxxxxxxxx>
- *
- *  This work is licensed under the terms of the GNU GPL, version 2. See
- *  the COPYING file in the top-level directory.
   */
#include <linux/rculist.h>
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   *  mm/userfaultfd.c
   *
   *  Copyright (C) 2015  Red Hat, Inc.
- *
- *  This work is licensed under the terms of the GNU GPL, version 2. See
- *  the COPYING file in the top-level directory.
   */
#include <linux/mm.h>
--- a/tools/kvm/kvm_stat/kvm_stat
+++ b/tools/kvm/kvm_stat/kvm_stat
@@ -1,4 +1,5 @@
  #!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0-only
  #
  # top-like utility for displaying kvm statistics
  #
@@ -8,8 +9,6 @@
  # Authors:
  #  Avi Kivity <avi@xxxxxxxxxx>
  #
-# This work is licensed under the terms of the GNU GPL, version 2.  See
-# the COPYING file in the top-level directory.
  """The kvm_stat module outputs statistics about running KVM VMs
Three different ways of output formatting are available:
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Stress userfaultfd syscall.
   *
   *  Copyright (C) 2015  Red Hat, Inc.
   *
- *  This work is licensed under the terms of the GNU GPL, version 2. See
- *  the COPYING file in the top-level directory.
- *
   * This test allocates two virtual areas and bounces the physical
   * memory across the two virtual areas (from area_src to area_dst)
   * using userfaultfd.
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Kernel-based Virtual Machine driver for Linux
   *
@@ -10,10 +11,6 @@
   * Authors:
   *   Avi Kivity   <avi@xxxxxxxxxxxx>
   *   Yaniv Kamay  <yaniv@xxxxxxxxxxxx>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
   */
#include <kvm/iodev.h>


Reviewed-By: Enrico Weigelt <info@xxxxxxxxx>

--
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@xxxxxxxxx -- +49-151-27565287



[Index of Archives]     [Linux Samsung SoC]     [Linux Rockchip SoC]     [Linux Actions SoC]     [Linux for Synopsys ARC Processors]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]


  Powered by Linux