genirq: Clean up license information
Subsystems (2)
cover genirq: Clean up license information
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
Remove pointless references to the file name itself and condense the information so it wastes less space.
Signed-off-by Thomas Gleixner <[email protected]>
--- 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(-)
kernel/irq/autoprobe.c +0 -2
@@ -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.
kernel/irq/chip.c +3 -6
@@ -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>
kernel/irq/handle.c +2 -5
@@ -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 * */
kernel/irq/ipi.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/ipi.c -* * Copyright (C) 2015 Imagination Technologies Ltd * Author: Qais Yousef <[email protected]> *
kernel/irq/irqdesc.c +2 -3
@@ -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>
kernel/irq/manage.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/manage.c -* * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar * Copyright (C) 2005-2006 Thomas Gleixner *
kernel/irq/msi.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/msi.c -* * Copyright (C) 2014 Intel Corp. * Author: Jiang Liu <[email protected]> *
kernel/irq/pm.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/pm.c -* * Copyright (C) 2009 Rafael J. Wysocki <[email protected]>, Novell Inc. * * This file contains power management functions related to interrupts.
kernel/irq/proc.c +0 -2
@@ -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.
kernel/irq/resend.c +0 -2
@@ -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 *
kernel/irq/spurious.c +0 -2
@@ -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.
kernel/irq/timings.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/timings.c -* * Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <[email protected]> * * This program is free software; you can redistribute it and/or modify
tip-bot for Thomas Gleixner
merge bot[tip:irq/core] genirq: Cleanup top of file comments
genirq: Cleanup top of file comments
Commit-ID: 99bfce5db9c071800bdc7e9658a68e6d11aeecf6 Gitweb: https://git.kernel.org/tip/99bfce5db9c071800bdc7e9658a68e6d11aeecf6 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 14 Mar 2018 22:15:16 +0100 Committer: Thomas Gleixner <[email protected]> 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 <[email protected]>
Acked-by Marc Zyngier <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Philippe Ombredanne <[email protected]>
--- 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(-)
kernel/irq/autoprobe.c +0 -2
@@ -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.
kernel/irq/chip.c +3 -6
@@ -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>
kernel/irq/handle.c +2 -5
@@ -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 * */
kernel/irq/ipi.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/ipi.c -* * Copyright (C) 2015 Imagination Technologies Ltd * Author: Qais Yousef <[email protected]> *
kernel/irq/irqdesc.c +2 -3
@@ -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>
kernel/irq/manage.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/manage.c -* * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar * Copyright (C) 2005-2006 Thomas Gleixner *
kernel/irq/msi.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/msi.c -* * Copyright (C) 2014 Intel Corp. * Author: Jiang Liu <[email protected]> *
kernel/irq/pm.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/pm.c -* * Copyright (C) 2009 Rafael J. Wysocki <[email protected]>, Novell Inc. * * This file contains power management functions related to interrupts.
kernel/irq/proc.c +0 -2
@@ -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.
kernel/irq/resend.c +0 -2
@@ -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 *
kernel/irq/spurious.c +0 -2
@@ -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.
kernel/irq/timings.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/irq/timings.c -* * Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <[email protected]> * * This program is free software; you can redistribute it and/or modify
PATCH 2/4 genirq/matrix: Cleanup SPDX identifier
In reply to Thomas GleixnerUse the proper SPDX-Identifier format.
Signed-off-by Thomas Gleixner <[email protected]>
--- kernel/irq/matrix.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
kernel/irq/matrix.c +3 -5
@@ -1,8 +1,6 @@ -/* -* Copyright (C) 2017 Thomas Gleixner <[email protected]> -* -* SPDX-License-Identifier: GPL-2.0 -*/ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2017 Thomas Gleixner <[email protected]> +#include <linux/spinlock.h> #include <linux/seq_file.h> #include <linux/bitmap.h>
tip-bot for Thomas Gleixner
merge bot[tip:irq/core] genirq/matrix: Cleanup SPDX identifier
genirq/matrix: Cleanup SPDX identifier
Commit-ID: 90cafdd521721eb588a738fae17ac70e50675686 Gitweb: https://git.kernel.org/tip/90cafdd521721eb588a738fae17ac70e50675686 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 14 Mar 2018 22:15:17 +0100 Committer: Thomas Gleixner <[email protected]> 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 <[email protected]>
Acked-by Marc Zyngier <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Philippe Ombredanne <[email protected]>
--- kernel/irq/matrix.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
kernel/irq/matrix.c +3 -5
@@ -1,8 +1,6 @@ -/* -* Copyright (C) 2017 Thomas Gleixner <[email protected]> -* -* SPDX-License-Identifier: GPL-2.0 -*/ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2017 Thomas Gleixner <[email protected]> +#include <linux/spinlock.h> #include <linux/seq_file.h> #include <linux/bitmap.h>
PATCH 3/4 genirq: Convert various GPL references to SPDX
In reply to Thomas GleixnerThese 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 <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Yang Yingliang <[email protected]>
Cc Russell King <[email protected]>
Cc Bartosz Golaszewski <[email protected]>
Cc H. Peter Anvin <[email protected]>
--- 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(-)
kernel/irq/cpuhotplug.c +1 -4
@@ -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>
kernel/irq/debugfs.c +3 -5
@@ -1,8 +1,6 @@ -/* -* Copyright 2017 Thomas Gleixner <[email protected]> -* -* This file is licensed under the GPL V2. -*/ +// SPDX-License-Identifier: GPL-2.0 +// Copyright 2017 Thomas Gleixner <[email protected]> +#include <linux/irqdomain.h> #include <linux/irq.h> #include <linux/uaccess.h>
kernel/irq/irq_sim.c +2 -8
@@ -1,11 +1,5 @@ -/* -* Copyright (C) 2017 Bartosz Golaszewski <[email protected]> -* -* 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 <[email protected]> #include <linux/slab.h> #include <linux/irq_sim.h>
kernel/irq/msi.c +1 -2
@@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2014 Intel Corp. * Author: Jiang Liu <[email protected]> * -* This file is licensed under GPLv2. -* * This file contains common code to support Message Signalled Interrupt for * PCI compatible and non PCI compatible devices. */
kernel/irq/timings.c +3 -8
@@ -1,11 +1,6 @@ -/* -* Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <[email protected]> -* -* 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 <[email protected]> +#include <linux/kernel.h> #include <linux/percpu.h> #include <linux/slab.h>
Re: [patch 3/4] genirq: Convert various GPL references to SPDX
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 <[email protected]>
PATCH 4/4 genirq: Add missing SPDX identifiers
In reply to Thomas GleixnerThese 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 <[email protected]>
--- 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(+)
kernel/irq/chip.c +1 -0
@@ -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
kernel/irq/devres.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/module.h> #include <linux/interrupt.h> #include <linux/device.h>
kernel/irq/dummychip.c +1 -0
@@ -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
kernel/irq/generic-chip.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Library implementing the most common irq chip callback functions *
kernel/irq/handle.c +1 -0
@@ -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
kernel/irq/ipi.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2015 Imagination Technologies Ltd * Author: Qais Yousef <[email protected]>
kernel/irq/irqdesc.c +1 -0
@@ -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
kernel/irq/irqdomain.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +#define pr_fmt (fmt) "irq: " fmt#include <linux/acpi.h>
kernel/irq/manage.c +1 -0
@@ -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
kernel/irq/pm.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2009 Rafael J. Wysocki <[email protected]>, Novell Inc. *
tip-bot for Thomas Gleixner
merge bot[tip:irq/core] genirq: Add missing SPDX identifiers
genirq: Add missing SPDX identifiers
Commit-ID: 52a65ff5603e685e9b19c2e108b3f0826dc7a86b Gitweb: https://git.kernel.org/tip/52a65ff5603e685e9b19c2e108b3f0826dc7a86b Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 14 Mar 2018 22:15:19 +0100 Committer: Thomas Gleixner <[email protected]> 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 <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Philippe Ombredanne <[email protected]>
--- 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(+)
kernel/irq/chip.c +1 -0
@@ -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
kernel/irq/cpuhotplug.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic cpu hotunplug interrupt migration code copied from the * arch/arm implementation
kernel/irq/debugfs.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright 2017 Thomas Gleixner <[email protected]> *
kernel/irq/devres.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/module.h> #include <linux/interrupt.h> #include <linux/device.h>
kernel/irq/dummychip.c +1 -0
@@ -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
kernel/irq/generic-chip.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Library implementing the most common irq chip callback functions *
kernel/irq/handle.c +1 -0
@@ -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
kernel/irq/ipi.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2015 Imagination Technologies Ltd * Author: Qais Yousef <[email protected]>
kernel/irq/irq_sim.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Bartosz Golaszewski <[email protected]> *
kernel/irq/irqdesc.c +1 -0
@@ -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
kernel/irq/irqdomain.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +#define pr_fmt (fmt) "irq: " fmt#include <linux/acpi.h>
kernel/irq/manage.c +1 -0
@@ -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
kernel/irq/msi.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2014 Intel Corp. * Author: Jiang Liu <[email protected]>
kernel/irq/pm.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2009 Rafael J. Wysocki <[email protected]>, Novell Inc. *
kernel/irq/timings.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <[email protected]> *
tip-bot for Thomas Gleixner
merge bot[tip:irq/core] genirq: Remove license boilerplate/references
In reply to Thomas Gleixnergenirq: Remove license boilerplate/references
Commit-ID: f3f59fbc54b76945ebc92772bd86f60728205da3 Gitweb: https://git.kernel.org/tip/f3f59fbc54b76945ebc92772bd86f60728205da3 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 20 Mar 2018 14:17:04 +0100 Committer: Thomas Gleixner <[email protected]> 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 <[email protected]>
Acked-by Daniel Lezcano <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Philippe Ombredanne <[email protected]>
--- kernel/irq/debugfs.c | 7 ++----- kernel/irq/timings.c | 10 ++-------- 2 files changed, 4 insertions(+), 13 deletions(-)
kernel/irq/debugfs.c +2 -5
@@ -1,9 +1,6 @@// SPDX-License-Identifier: GPL-2.0 -/* -* Copyright 2017 Thomas Gleixner <[email protected]> -* -* This file is licensed under the GPL V2. -*/ +// Copyright 2017 Thomas Gleixner <[email protected]> +#include <linux/irqdomain.h> #include <linux/irq.h> #include <linux/uaccess.h>
kernel/irq/timings.c +2 -8
@@ -1,12 +1,6 @@// SPDX-License-Identifier: GPL-2.0 -/* -* Copyright (C) 2016, Linaro Ltd - Daniel Lezcano <[email protected]> -* -* 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 <[email protected]> +#include <linux/kernel.h> #include <linux/percpu.h> #include <linux/slab.h>
Quoted 5 lines · 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
Quoted 7 lines
* 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 <[email protected]>
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Quoted 5 lines · 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
Quoted 7 lines
* 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?
Quoted 14 lines · Joe Perches
Quoted 5 lines · 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
Quoted 7 lines
* 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.
Quoted 5 lines
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
Quoted 15 lines · Greg Kroah-Hartman
Quoted 14 lines · Joe Perches
Quoted 12 lines · 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.
Quoted 8 lines
Quoted 5 lines
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?
Quoted 2 lines
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