[patch 0/4] genirq: Clean up license information

[patch 0/4] genirq: Clean up license information

[Thomas Gleixner]

The following patch series cleans up the licensing information in the
generic irq subsystem.

  * Replace boiler plate language and sloppy references with SPDX

  * Add missing SPDX identifiers to files with no license reference

  * Use the proper tag format

While at it clean up the top of file comments by removing pointless
references to the filename itself and condense the information where
appropriate.

Thanks,

	tglx

---
 autoprobe.c    |    2 --
 chip.c         |   10 ++++------
 cpuhotplug.c   |    5 +----
 debugfs.c      |    8 +++-----
 devres.c       |    1 +
 dummychip.c    |    1 +
 generic-chip.c |    1 +
 handle.c       |    8 +++-----
 ipi.c          |    3 +--
 irq_sim.c      |   10 ++--------
 irqdesc.c      |    6 +++---
 irqdomain.c    |    2 ++
 manage.c       |    3 +--
 matrix.c       |    8 +++-----
 msi.c          |    5 +----
 pm.c           |    3 +--
 proc.c         |    2 --
 resend.c       |    2 --
 spurious.c     |    2 --
 timings.c      |   13 +++----------
 20 files changed, 31 insertions(+), 64 deletions(-)

[patch 1/4] genirq: Cleanup top of file comments

[Thomas Gleixner]

[-- Attachment #1: genirq--Remove-pointless-file-references-in-top-comments.patch --]
[-- Type: text/plain, Size: 4458 bytes --]

Remove pointless references to the file name itself and condense the
information so it wastes less space.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/irq/autoprobe.c |    2 --
 kernel/irq/chip.c      |    9 +++------
 kernel/irq/handle.c    |    7 ++-----
 kernel/irq/ipi.c       |    2 --
 kernel/irq/irqdesc.c   |    5 ++---
 kernel/irq/manage.c    |    2 --
 kernel/irq/msi.c       |    2 --
 kernel/irq/pm.c        |    2 --
 kernel/irq/proc.c      |    2 --
 kernel/irq/resend.c    |    2 --
 kernel/irq/spurious.c  |    2 --
 kernel/irq/timings.c   |    2 --
 12 files changed, 7 insertions(+), 32 deletions(-)

--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * linux/kernel/irq/autoprobe.c
- *
  * Copyright (C) 1992, 1998-2004 Linus Torvalds, Ingo Molnar
  *
  * This file contains the interrupt probing code and driver APIs.
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -1,13 +1,10 @@
 /*
- * linux/kernel/irq/chip.c
- *
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
  *
- * This file contains the core interrupt handling code, for irq-chip
- * based architectures.
- *
- * Detailed information is available in Documentation/core-api/genericirq.rst
+ * This file contains the core interrupt handling code, for irq-chip based
+ * architectures. Detailed information is available in
+ * Documentation/core-api/genericirq.rst
  */
 
 #include <linux/irq.h>
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -1,12 +1,9 @@
 /*
- * linux/kernel/irq/handle.c
- *
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
  *
- * This file contains the core interrupt handling code.
- *
- * Detailed information is available in Documentation/core-api/genericirq.rst
+ * This file contains the core interrupt handling code. Detailed
+ * information is available in Documentation/core-api/genericirq.rst
  *
  */
 
--- a/kernel/irq/ipi.c
+++ b/kernel/irq/ipi.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/ipi.c
- *
  * Copyright (C) 2015 Imagination Technologies Ltd
  * Author: Qais Yousef <qais.yousef@imgtec.com>
  *
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -2,9 +2,8 @@
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
  *
- * This file contains the interrupt descriptor management code
- *
- * Detailed information is available in Documentation/core-api/genericirq.rst
+ * This file contains the interrupt descriptor management code. Detailed
+ * information is available in Documentation/core-api/genericirq.rst
  *
  */
 #include <linux/irq.h>
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/manage.c
- *
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006 Thomas Gleixner
  *
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/msi.c
- *
  * Copyright (C) 2014 Intel Corp.
  * Author: Jiang Liu <jiang.liu@linux.intel.com>
  *
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/pm.c
- *
  * Copyright (C) 2009 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
  *
  * This file contains power management functions related to interrupts.
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * linux/kernel/irq/proc.c
- *
  * Copyright (C) 1992, 1998-2004 Linus Torvalds, Ingo Molnar
  *
  * This file contains the /proc/irq/ handling code.
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * linux/kernel/irq/resend.c
- *
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner
  *
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * linux/kernel/irq/spurious.c
- *
  * Copyright (C) 1992, 1998-2004 Linus Torvalds, Ingo Molnar
  *
  * This file contains spurious interrupt handling.
--- a/kernel/irq/timings.c
+++ b/kernel/irq/timings.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/timings.c
- *
  * Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <daniel.lezcano@linaro.org>
  *
  * This program is free software; you can redistribute it and/or modify

[patch 2/4] genirq/matrix: Cleanup SPDX identifier

[Thomas Gleixner]

[-- Attachment #1: genirq--Cleanup-SPDX-identifiers.patch --]
[-- Type: text/plain, Size: 545 bytes --]

Use the proper SPDX-Identifier format.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/irq/matrix.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- a/kernel/irq/matrix.c
+++ b/kernel/irq/matrix.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2017 Thomas Gleixner <tglx@linutronix.de>
- *
- * SPDX-License-Identifier: GPL-2.0
- */
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2017 Thomas Gleixner <tglx@linutronix.de>
+
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>
 #include <linux/bitmap.h>

[patch 3/4] genirq: Convert various GPL references to SPDX

[Thomas Gleixner]

[-- Attachment #1: genirq--Convert-various-GPL-references-to-SPDX.patch --]
[-- Type: text/plain, Size: 3056 bytes --]

These files contain various forms of boilerplate language and sloppy GPL
references.

Replace all of them with the proper SPDX identifiers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Yang Yingliang <yangyingliang@huawei.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: H. Peter Anvin <hpa@zytor.com>
---
 kernel/irq/cpuhotplug.c |    5 +----
 kernel/irq/debugfs.c    |    8 +++-----
 kernel/irq/irq_sim.c    |   10 ++--------
 kernel/irq/msi.c        |    3 +--
 kernel/irq/timings.c    |   11 +++--------
 5 files changed, 10 insertions(+), 27 deletions(-)

--- a/kernel/irq/cpuhotplug.c
+++ b/kernel/irq/cpuhotplug.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic cpu hotunplug interrupt migration code copied from the
  * arch/arm implementation
  *
  * Copyright (C) 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.
  */
 #include <linux/interrupt.h>
 #include <linux/ratelimit.h>
--- a/kernel/irq/debugfs.c
+++ b/kernel/irq/debugfs.c
@@ -1,8 +1,6 @@
-/*
- * Copyright 2017 Thomas Gleixner <tglx@linutronix.de>
- *
- * This file is licensed under the GPL V2.
- */
+// SPDX-License-Identifier: GPL-2.0
+// Copyright 2017 Thomas Gleixner <tglx@linutronix.de>
+
 #include <linux/irqdomain.h>
 #include <linux/irq.h>
 #include <linux/uaccess.h>
--- a/kernel/irq/irq_sim.c
+++ b/kernel/irq/irq_sim.c
@@ -1,11 +1,5 @@
-/*
- * Copyright (C) 2017 Bartosz Golaszewski <brgl@bgdev.pl>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright (C) 2017 Bartosz Golaszewski <brgl@bgdev.pl>
 
 #include <linux/slab.h>
 #include <linux/irq_sim.h>
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Intel Corp.
  * Author: Jiang Liu <jiang.liu@linux.intel.com>
  *
- * This file is licensed under GPLv2.
- *
  * This file contains common code to support Message Signalled Interrupt for
  * PCI compatible and non PCI compatible devices.
  */
--- a/kernel/irq/timings.c
+++ b/kernel/irq/timings.c
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <daniel.lezcano@linaro.org>
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <daniel.lezcano@linaro.org>
+
 #include <linux/kernel.h>
 #include <linux/percpu.h>
 #include <linux/slab.h>

[patch 4/4] genirq: Add missing SPDX identifiers

[Thomas Gleixner]

[-- Attachment #1: genirq--Add-missing-SPDX-identifiers.patch --]
[-- Type: text/plain, Size: 2751 bytes --]

These files do not contain a license reference and were not updated in the
initial SPDX conversion because the license was deduced by the scanners via
EXPORT_SYMBOL_GPL as GPL2.0 only.

Add the missing GPL-2.0 identifiers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/irq/chip.c         |    1 +
 kernel/irq/devres.c       |    1 +
 kernel/irq/dummychip.c    |    1 +
 kernel/irq/generic-chip.c |    1 +
 kernel/irq/handle.c       |    1 +
 kernel/irq/ipi.c          |    1 +
 kernel/irq/irqdesc.c      |    1 +
 kernel/irq/irqdomain.c    |    2 ++
 kernel/irq/manage.c       |    1 +
 kernel/irq/pm.c           |    1 +
 10 files changed, 11 insertions(+)

--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
--- a/kernel/irq/devres.c
+++ b/kernel/irq/devres.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
--- a/kernel/irq/dummychip.c
+++ b/kernel/irq/dummychip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
--- a/kernel/irq/generic-chip.c
+++ b/kernel/irq/generic-chip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Library implementing the most common irq chip callback functions
  *
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
--- a/kernel/irq/ipi.c
+++ b/kernel/irq/ipi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2015 Imagination Technologies Ltd
  * Author: Qais Yousef <qais.yousef@imgtec.com>
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
 #define pr_fmt(fmt)  "irq: " fmt
 
 #include <linux/acpi.h>
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006 Thomas Gleixner
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2009 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
  *

Re: [patch 3/4] genirq: Convert various GPL references to SPDX

[Daniel Lezcano]

These files contain various forms of boilerplate language and sloppy GPL
references.

Replace all of them with the proper SPDX identifiers.

[ ... ]

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>

Re: [patch 0/4] genirq: Clean up license information

[Marc Zyngier]

On 14/03/18 21:15, Thomas Gleixner wrote:
> The following patch series cleans up the licensing information in the
> generic irq subsystem.
> 
>   * Replace boiler plate language and sloppy references with SPDX
> 
>   * Add missing SPDX identifiers to files with no license reference
> 
>   * Use the proper tag format
> 
> While at it clean up the top of file comments by removing pointless
> references to the filename itself and condense the information where
> appropriate.

For the series:

Acked-by: Marc Zyngier <marc.zyngier@arm.com>

	M.
-- 
Jazz is not dead. It just smells funny...

Re: [patch 0/4] genirq: Clean up license information

[Joe Perches]

On Wed, 2018-03-14 at 22:15 +0100, Thomas Gleixner wrote:
> The following patch series cleans up the licensing information in the
> generic irq subsystem.
> 
>   * Replace boiler plate language and sloppy references with SPDX
> 
>   * Add missing SPDX identifiers to files with no license reference
> 
>   * Use the proper tag format
> 
> While at it clean up the top of file comments by removing pointless
> references to the filename itself and condense the information where
> appropriate.

Hello.

What do you think of the proposal to convert all the tags
to the "-or-later" and "-only" variants that the
https://spdx.org/licenses/ uses today?

Re: [patch 0/4] genirq: Clean up license information

[Greg Kroah-Hartman]

On Thu, Mar 15, 2018 at 08:00:18AM -0700, Joe Perches wrote:
> On Wed, 2018-03-14 at 22:15 +0100, Thomas Gleixner wrote:
> > The following patch series cleans up the licensing information in the
> > generic irq subsystem.
> > 
> >   * Replace boiler plate language and sloppy references with SPDX
> > 
> >   * Add missing SPDX identifiers to files with no license reference
> > 
> >   * Use the proper tag format
> > 
> > While at it clean up the top of file comments by removing pointless
> > references to the filename itself and condense the information where
> > appropriate.
> 
> Hello.
> 
> What do you think of the proposal to convert all the tags
> to the "-or-later" and "-only" variants that the
> https://spdx.org/licenses/ uses today?

Ick ick ick ick.  Let's stick with what we have today, if we do decide
to do this type of foolishness, we can do it all in one simple script to
email to Linus to run on his tree.

thanks,

greg k-h

Re: [patch 0/4] genirq: Clean up license information

[Joe Perches]

On Thu, 2018-03-15 at 18:23 +0100, Greg Kroah-Hartman wrote:
> On Thu, Mar 15, 2018 at 08:00:18AM -0700, Joe Perches wrote:
> > On Wed, 2018-03-14 at 22:15 +0100, Thomas Gleixner wrote:
> > > The following patch series cleans up the licensing information in the
> > > generic irq subsystem.
> > > 
> > >   * Replace boiler plate language and sloppy references with SPDX
> > > 
> > >   * Add missing SPDX identifiers to files with no license reference
> > > 
> > >   * Use the proper tag format
> > > 
> > > While at it clean up the top of file comments by removing pointless
> > > references to the filename itself and condense the information where
> > > appropriate.
> > 
> > Hello.
> > 
> > What do you think of the proposal to convert all the tags
> > to the "-or-later" and "-only" variants that the
> > https://spdx.org/licenses/ uses today?
> 
> Ick ick ick ick.  Let's stick with what we have today, if we do decide
> to do this type of foolishness,

Why would it be foolish to have the kernel
match the spdx license text?

> we can do it all in one simple script to
> email to Linus to run on his tree.

I sent that script Feb 8.

Here it is again:
---
#!/bin/bash

license_script=$(mktemp -t convert-SPDX-licenses.XXXXXXXXX.pl)
cat <<'EOF' >> $license_script

our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;

sub deparenthesize {
	my ($string) = @_;

	return "" if (!defined($string));

	while ($string =~ /^\s*\(.*\)\s*$/) {
		$string =~ s@^\s*\(\s*@@;
		$string =~ s@\s*\)\s*$@@;
	}

	return $string;
}

for my $filename (@ARGV) {
	my $FILE;

	if ($filename eq '-') {
		open($FILE, '<&STDIN');
	} else {
		open($FILE, '<', "$filename") ||
			die "$P: $filename: open failed - $!\n";
	}
	undef $/;
	my $file = <$FILE>;
	close $FILE;

	my $spdx = "SPDX-License-Identifier:";

	$file =~ s/\b$spdx[ \t]*((?:\([ \t]*)*)GPL(\d\.\d)/$spdx \1GPL-\2/g;
	$file =~ s/\b$spdx[ \t]*((?:\([ \t]*)*)(L?GPL-\d\.\d)\+/$spdx \1\2-or-later/g;
	$file =~ s/\b$spdx[ \t]*((?:\([ \t]*)*)(L?GPL-\d\.\d)(?!-or-later|-only)/$spdx \1\2-only/g;

	while ($file =~ s/\b$spdx[ \t]($balanced_parens)(?![ \t]*AND|[ \t]*OR)/$spdx . ' ' . deparenthesize($1)/ex) {
		;
	}

	if ($filename eq '-') {
		open($FILE, '>&STDOUT');
	} else {
		open($FILE, '>', "$filename") ||
			die "$P: $filename: open failed - $!\n";
	}
	print $FILE $file;
	close $FILE;
}
EOF

git grep --name-only "$spdx" | \
    grep -vP "^(?:LICENSES/|Documentation/process/license-rules\.rst)" | \
    xargs perl $license_script

rm -f $license_script

[tip:irq/core] genirq: Cleanup top of file comments

[tip-bot for Thomas Gleixner]

Commit-ID:  99bfce5db9c071800bdc7e9658a68e6d11aeecf6
Gitweb:     https://git.kernel.org/tip/99bfce5db9c071800bdc7e9658a68e6d11aeecf6
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Wed, 14 Mar 2018 22:15:16 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 20 Mar 2018 14:23:27 +0100

genirq: Cleanup top of file comments

Remove pointless references to the file name itself and condense the
information so it wastes less space.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Link: https://lkml.kernel.org/r/20180314212030.412095827@linutronix.de

---
 kernel/irq/autoprobe.c | 2 --
 kernel/irq/chip.c      | 9 +++------
 kernel/irq/handle.c    | 7 ++-----
 kernel/irq/ipi.c       | 2 --
 kernel/irq/irqdesc.c   | 5 ++---
 kernel/irq/manage.c    | 2 --
 kernel/irq/msi.c       | 2 --
 kernel/irq/pm.c        | 2 --
 kernel/irq/proc.c      | 2 --
 kernel/irq/resend.c    | 2 --
 kernel/irq/spurious.c  | 2 --
 kernel/irq/timings.c   | 2 --
 12 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 8c82ea26e837..16cbf6beb276 100644
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * linux/kernel/irq/autoprobe.c
- *
  * Copyright (C) 1992, 1998-2004 Linus Torvalds, Ingo Molnar
  *
  * This file contains the interrupt probing code and driver APIs.
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index c69357a43849..b575c7a93b76 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -1,13 +1,10 @@
 /*
- * linux/kernel/irq/chip.c
- *
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
  *
- * This file contains the core interrupt handling code, for irq-chip
- * based architectures.
- *
- * Detailed information is available in Documentation/core-api/genericirq.rst
+ * This file contains the core interrupt handling code, for irq-chip based
+ * architectures. Detailed information is available in
+ * Documentation/core-api/genericirq.rst
  */
 
 #include <linux/irq.h>
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 3570c715c3e7..1bf69b6571a3 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -1,12 +1,9 @@
 /*
- * linux/kernel/irq/handle.c
- *
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
  *
- * This file contains the core interrupt handling code.
- *
- * Detailed information is available in Documentation/core-api/genericirq.rst
+ * This file contains the core interrupt handling code. Detailed
+ * information is available in Documentation/core-api/genericirq.rst
  *
  */
 
diff --git a/kernel/irq/ipi.c b/kernel/irq/ipi.c
index 259a22aa9934..4da9cf0a935c 100644
--- a/kernel/irq/ipi.c
+++ b/kernel/irq/ipi.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/ipi.c
- *
  * Copyright (C) 2015 Imagination Technologies Ltd
  * Author: Qais Yousef <qais.yousef@imgtec.com>
  *
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index d9ded088d336..55515cce1cc2 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -2,9 +2,8 @@
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
  *
- * This file contains the interrupt descriptor management code
- *
- * Detailed information is available in Documentation/core-api/genericirq.rst
+ * This file contains the interrupt descriptor management code. Detailed
+ * information is available in Documentation/core-api/genericirq.rst
  *
  */
 #include <linux/irq.h>
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index b0aa23b2398e..99eb1977e784 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/manage.c
- *
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006 Thomas Gleixner
  *
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 2f3c4f5382cc..8429c88427ff 100644
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/msi.c
- *
  * Copyright (C) 2014 Intel Corp.
  * Author: Jiang Liu <jiang.liu@linux.intel.com>
  *
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 6bd9b58429cc..474d3fa32a28 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/pm.c
- *
  * Copyright (C) 2009 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
  *
  * This file contains power management functions related to interrupts.
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index e8f374971e37..7cb091d81d91 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * linux/kernel/irq/proc.c
- *
  * Copyright (C) 1992, 1998-2004 Linus Torvalds, Ingo Molnar
  *
  * This file contains the /proc/irq/ handling code.
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 1d08f45135c2..95414ad3506a 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * linux/kernel/irq/resend.c
- *
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner
  *
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 6cdecc6f4c53..d867d6ddafdd 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * linux/kernel/irq/spurious.c
- *
  * Copyright (C) 1992, 1998-2004 Linus Torvalds, Ingo Molnar
  *
  * This file contains spurious interrupt handling.
diff --git a/kernel/irq/timings.c b/kernel/irq/timings.c
index e0923fa4927a..c87099b2ea50 100644
--- a/kernel/irq/timings.c
+++ b/kernel/irq/timings.c
@@ -1,6 +1,4 @@
 /*
- * linux/kernel/irq/timings.c
- *
  * Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <daniel.lezcano@linaro.org>
  *
  * This program is free software; you can redistribute it and/or modify

[tip:irq/core] genirq/matrix: Cleanup SPDX identifier

[tip-bot for Thomas Gleixner]

Commit-ID:  90cafdd521721eb588a738fae17ac70e50675686
Gitweb:     https://git.kernel.org/tip/90cafdd521721eb588a738fae17ac70e50675686
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Wed, 14 Mar 2018 22:15:17 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 20 Mar 2018 14:23:28 +0100

genirq/matrix: Cleanup SPDX identifier

Use the proper SPDX-Identifier format.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Link: https://lkml.kernel.org/r/20180314212030.492674761@linutronix.de

---
 kernel/irq/matrix.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/irq/matrix.c b/kernel/irq/matrix.c
index 4c5770407031..5092494bf261 100644
--- a/kernel/irq/matrix.c
+++ b/kernel/irq/matrix.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2017 Thomas Gleixner <tglx@linutronix.de>
- *
- * SPDX-License-Identifier: GPL-2.0
- */
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2017 Thomas Gleixner <tglx@linutronix.de>
+
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>
 #include <linux/bitmap.h>

[tip:irq/core] genirq: Add missing SPDX identifiers

[tip-bot for Thomas Gleixner]

Commit-ID:  52a65ff5603e685e9b19c2e108b3f0826dc7a86b
Gitweb:     https://git.kernel.org/tip/52a65ff5603e685e9b19c2e108b3f0826dc7a86b
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Wed, 14 Mar 2018 22:15:19 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 20 Mar 2018 14:23:28 +0100

genirq: Add missing SPDX identifiers

Add SPDX identifiers to files

 - which contain an explicit license boiler plate or reference

 - which do not contain a license reference and were not updated in the
   initial SPDX conversion because the license was deduced by the scanners
   via EXPORT_SYMBOL_GPL as GPL2.0 only.

[ tglx: Moved adding identifiers from the patch which removes the
  	references/boilerplate ]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Link: https://lkml.kernel.org/r/20180314212030.668321222@linutronix.de

---
 kernel/irq/chip.c         | 1 +
 kernel/irq/cpuhotplug.c   | 1 +
 kernel/irq/debugfs.c      | 1 +
 kernel/irq/devres.c       | 1 +
 kernel/irq/dummychip.c    | 1 +
 kernel/irq/generic-chip.c | 1 +
 kernel/irq/handle.c       | 1 +
 kernel/irq/ipi.c          | 1 +
 kernel/irq/irq_sim.c      | 1 +
 kernel/irq/irqdesc.c      | 1 +
 kernel/irq/irqdomain.c    | 2 ++
 kernel/irq/manage.c       | 1 +
 kernel/irq/msi.c          | 1 +
 kernel/irq/pm.c           | 1 +
 kernel/irq/timings.c      | 1 +
 15 files changed, 16 insertions(+)

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index b575c7a93b76..a2b3d9de999c 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
diff --git a/kernel/irq/cpuhotplug.c b/kernel/irq/cpuhotplug.c
index 9eb09aef0313..5b1072e394b2 100644
--- a/kernel/irq/cpuhotplug.c
+++ b/kernel/irq/cpuhotplug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic cpu hotunplug interrupt migration code copied from the
  * arch/arm implementation
diff --git a/kernel/irq/debugfs.c b/kernel/irq/debugfs.c
index acfaaef8672a..c8cc6ce9c1c3 100644
--- a/kernel/irq/debugfs.c
+++ b/kernel/irq/debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 2017 Thomas Gleixner <tglx@linutronix.de>
  *
diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c
index 194c506d9d20..6a682c229e10 100644
--- a/kernel/irq/devres.c
+++ b/kernel/irq/devres.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
diff --git a/kernel/irq/dummychip.c b/kernel/irq/dummychip.c
index 326a67f2410b..0b0cdf206dc4 100644
--- a/kernel/irq/dummychip.c
+++ b/kernel/irq/dummychip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c
index 508c03dfef25..e2999a070a99 100644
--- a/kernel/irq/generic-chip.c
+++ b/kernel/irq/generic-chip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Library implementing the most common irq chip callback functions
  *
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 1bf69b6571a3..38554bc35375 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
diff --git a/kernel/irq/ipi.c b/kernel/irq/ipi.c
index 4da9cf0a935c..8b778e37dc6d 100644
--- a/kernel/irq/ipi.c
+++ b/kernel/irq/ipi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2015 Imagination Technologies Ltd
  * Author: Qais Yousef <qais.yousef@imgtec.com>
diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c
index 85690859a2a8..fc4f361a86bb 100644
--- a/kernel/irq/irq_sim.c
+++ b/kernel/irq/irq_sim.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Bartosz Golaszewski <brgl@bgdev.pl>
  *
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index 55515cce1cc2..afc7f902d74a 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 82b8b18ee1eb..5d9fc01b60a6 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
 #define pr_fmt(fmt)  "irq: " fmt
 
 #include <linux/acpi.h>
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 99eb1977e784..e3336d904f64 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
  * Copyright (C) 2005-2006 Thomas Gleixner
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 8429c88427ff..2a8571f72b17 100644
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Intel Corp.
  * Author: Jiang Liu <jiang.liu@linux.intel.com>
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 474d3fa32a28..d6961d3c6f9e 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2009 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
  *
diff --git a/kernel/irq/timings.c b/kernel/irq/timings.c
index c87099b2ea50..223d47937c48 100644
--- a/kernel/irq/timings.c
+++ b/kernel/irq/timings.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <daniel.lezcano@linaro.org>
  *

[tip:irq/core] genirq: Remove license boilerplate/references

[tip-bot for Thomas Gleixner]

Commit-ID:  f3f59fbc54b76945ebc92772bd86f60728205da3
Gitweb:     https://git.kernel.org/tip/f3f59fbc54b76945ebc92772bd86f60728205da3
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Tue, 20 Mar 2018 14:17:04 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 20 Mar 2018 14:23:28 +0100

genirq: Remove license boilerplate/references

Now that SPDX identifiers are in place, remove the boilerplate or
references.

The change in timings.c has been acked by the author.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Link: https://lkml.kernel.org/r/20180314212030.668321222@linutronix.de
---
 kernel/irq/debugfs.c |  7 ++-----
 kernel/irq/timings.c | 10 ++--------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/kernel/irq/debugfs.c b/kernel/irq/debugfs.c
index c8cc6ce9c1c3..4dadeb3d6666 100644
--- a/kernel/irq/debugfs.c
+++ b/kernel/irq/debugfs.c
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2017 Thomas Gleixner <tglx@linutronix.de>
- *
- * This file is licensed under the GPL V2.
- */
+// Copyright 2017 Thomas Gleixner <tglx@linutronix.de>
+
 #include <linux/irqdomain.h>
 #include <linux/irq.h>
 #include <linux/uaccess.h>
diff --git a/kernel/irq/timings.c b/kernel/irq/timings.c
index 223d47937c48..1e4cb63a5c82 100644
--- a/kernel/irq/timings.c
+++ b/kernel/irq/timings.c
@@ -1,12 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <daniel.lezcano@linaro.org>
- *
- * 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.
- *
- */
+// Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <daniel.lezcano@linaro.org>
+
 #include <linux/kernel.h>
 #include <linux/percpu.h>
 #include <linux/slab.h>