time: Add SPDX identifiers and cleanup boilerplates
Subsystems (4)
cover time: Add SPDX identifiers and cleanup boilerplates
Add SPDX identifiers to all files in kernel/time and remove the license boiler plates.
Aside of that use the chance to get rid of (stale) file references and tidy up the top of file comments as they are touched anyway by this work.
This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.
Thanks,
tglx
--- include/linux/hrtimer.h | 5 +---- kernel/time/alarmtimer.c | 5 +---- kernel/time/clockevents.c | 6 +----- kernel/time/clocksource.c | 20 +------------------- kernel/time/hrtimer.c | 19 +++++-------------- kernel/time/itimer.c | 2 -- kernel/time/jiffies.c | 28 ++++++---------------------- kernel/time/posix-clock.c | 17 ++--------------- kernel/time/posix-stubs.c | 5 +---- kernel/time/posix-timers.c | 25 ++----------------------- kernel/time/sched_clock.c | 9 +++------ kernel/time/test_udelay.c | 10 +--------- kernel/time/tick-broadcast-hrtimer.c | 4 +--- kernel/time/tick-broadcast.c | 6 +----- kernel/time/tick-common.c | 6 +----- kernel/time/tick-oneshot.c | 6 +----- kernel/time/tick-sched.c | 5 +---- kernel/time/time.c | 13 +++++-------- kernel/time/timeconst.bc | 2 ++ kernel/time/timeconv.c | 1 + kernel/time/timecounter.c | 17 ++--------------- kernel/time/timekeeping.c | 11 +++-------- kernel/time/timekeeping_debug.c | 11 +---------- kernel/time/timer.c | 3 +-- kernel/time/timer_list.c | 7 +------ 25 files changed, 45 insertions(+), 198 deletions(-)
PATCH 1/9 time: Remove useless filenames in top level comments
Remove the pointless filenames in the top level comments. They have no value at all and just occupy space. While at it tidy up some of the comments and remove a stale one.
--- include/linux/hrtimer.h | 2 -- kernel/time/clockevents.c | 2 -- kernel/time/clocksource.c | 5 ----- kernel/time/hrtimer.c | 16 ++++------------ kernel/time/itimer.c | 2 -- kernel/time/jiffies.c | 2 -- kernel/time/posix-clock.c | 2 +- kernel/time/posix-timers.c | 4 ---- kernel/time/sched_clock.c | 4 ++-- kernel/time/tick-broadcast-hrtimer.c | 4 +--- kernel/time/tick-broadcast.c | 2 -- kernel/time/tick-common.c | 2 -- kernel/time/tick-oneshot.c | 2 -- kernel/time/tick-sched.c | 2 -- kernel/time/time.c | 12 ++++-------- kernel/time/timecounter.c | 6 +----- kernel/time/timekeeping.c | 10 ++-------- kernel/time/timer.c | 2 -- kernel/time/timer_list.c | 2 -- 19 files changed, 15 insertions(+), 68 deletions(-)
include/linux/hrtimer.h +0 -2
@@ -1,6 +1,4 @@/* -* include/linux/hrtimer.h -* * hrtimers - High-resolution kernel timers * * Copyright(C) 2005, Thomas Gleixner <[email protected]>
kernel/time/clockevents.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/clockevents.c -* * This file contains functions which manage clock event devices. * * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
kernel/time/clocksource.c +0 -5
@@ -1,6 +1,4 @@/* -* linux/kernel/time/clocksource.c -* * This file contains the functions which manage clocksource drivers. * * Copyright (C) 2004, 2005 IBM, John Stultz ([email protected])
@@ -18,9 +16,6 @@* You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* -* TODO WishList: -* o Allow clocksource drivers to be unregistered */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
kernel/time/hrtimer.c +4 -12
@@ -1,26 +1,18 @@/* -* linux/kernel/hrtimer.c -* * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007 Timesys Corp., Thomas Gleixner * * High-resolution kernel timers * -* In contrast to the low-resolution timeout API implemented in -* kernel/timer.c, hrtimers provide finer resolution and accuracy -* depending on system configuration and capabilities. -* -* These timers are currently used for: -* - itimers -* - POSIX timers -* - nanosleep -* - precise in-kernel timing +* In contrast to the low-resolution timeout API, aka timer wheel, +* hrtimers provide finer resolution and accuracy depending on system +* configuration and capabilities. * * Started by: Thomas Gleixner and Ingo Molnar * * Credits: -* based on kernel/timer.c +* Based on the original timer wheel code * * Help, testing, suggestions, bugfixes, improvements were * provided by:
kernel/time/itimer.c +0 -2
@@ -1,7 +1,5 @@// SPDX-License-Identifier: GPL-2.0 /* -* linux/kernel/itimer.c -* * Copyright (C) 1992 Darren Senn */
kernel/time/jiffies.c +0 -2
@@ -1,6 +1,4 @@/*********************************************************************** -* linux/kernel/time/jiffies.c -* * This file contains the jiffies based clocksource. * * Copyright (C) 2004, 2005 IBM, John Stultz ([email protected])
kernel/time/posix-clock.c +1 -1
@@ -1,5 +1,5 @@/* -* posix-clock.c - support for dynamic clock devices +* Support for dynamic clock devices * * Copyright (C) 2010 OMICRON electronics GmbH *
kernel/time/posix-timers.c +0 -4
@@ -1,10 +1,6 @@/* -* linux/kernel/posix-timers.c -* -* * 2002-10-15 Posix Clocks & timers * by George Anzinger [email protected] -* * Copyright (C) 2002 2003 by MontaVista Software. * * 2004-06-01 Fix CLOCK_REALTIME clock/timer TIMER_ABSTIME bug.
kernel/time/sched_clock.c +2 -2
@@ -1,6 +1,6 @@/* -* sched_clock.c: Generic sched_clock() support, to extend low level -* hardware time counters to full 64-bit ns values. +* Generic sched_clock() support, to extend low level hardware time +* counters to full 64-bit ns values. * * 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
kernel/time/tick-broadcast-hrtimer.c +1 -3
@@ -1,8 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* linux/kernel/time/tick-broadcast-hrtimer.c -* This file emulates a local clock event device -* via a pseudo clock device. +* Emulate a local clock event device via a pseudo clock device. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/tick-broadcast.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/tick-broadcast.c -* * This file contains functions which emulate a local clock-event * device via a broadcast event source. *
kernel/time/tick-common.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/tick-common.c -* * This file contains the base functions to manage periodic tick * related events. *
kernel/time/tick-oneshot.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/tick-oneshot.c -* * This file contains functions which manage high resolution tick * related events. *
kernel/time/tick-sched.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/tick-sched.c -* * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007 Timesys Corp., Thomas Gleixner
kernel/time/time.c +4 -8
@@ -1,14 +1,10 @@/* -* linux/kernel/time.c -* * Copyright (C) 1991, 1992 Linus Torvalds * -* This file contains the interface functions for the various -* time related system calls: time, stime, gettimeofday, settimeofday, -* adjtime -*/ -/* -* Modification history kernel/time.c +* This file contains the interface functions for the various time related +* system calls: time, stime, gettimeofday, settimeofday, adjtime +* +* Modification history: * * 1993-09-02 Philip Gladstone * Created file with time related functions from sched/core.c and adjtimex()
kernel/time/timecounter.c +1 -5
@@ -1,8 +1,5 @@/* -* linux/kernel/time/timecounter.c -* -* based on code that migrated away from -* linux/kernel/time/clocksource.c +* Based on clocksource code. See commit 74d23cc704d1 * * 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
@@ -14,7 +11,6 @@* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include <linux/export.h> #include <linux/timecounter.h>
kernel/time/timekeeping.c +2 -8
@@ -1,13 +1,7 @@/* -* linux/kernel/time/timekeeping.c -* -* Kernel timekeeping code and accessor functions -* -* This code was moved from linux/kernel/timer.c. -* Please see that file for copyright and history logs. -* +* Kernel timekeeping code and accessor functions. Based on code from +* timer.c, moved in commit 8524070b7982. */ -#include <linux/timekeeper_internal.h> #include <linux/module.h> #include <linux/interrupt.h>
kernel/time/timer.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/timer.c -* * Kernel internal timers * * Copyright (C) 1991, 1992 Linus Torvalds
kernel/time/timer_list.c +0 -2
@@ -1,6 +1,4 @@/* -* kernel/time/timer_list.c -* * List pending timers * * Copyright(C) 2006, Red Hat, Inc., Ingo Molnar
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] time: Remove useless filenames in top level comments
time: Remove useless filenames in top level comments
Commit-ID: 58c5fc2b96e4ae65068d815a1c3ca81da92fa1c9 Gitweb: https://git.kernel.org/tip/58c5fc2b96e4ae65068d815a1c3ca81da92fa1c9 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 31 Oct 2018 19:21:08 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Nov 2018 11:51:20 +0100
time: Remove useless filenames in top level comments
Remove the pointless filenames in the top level comments. They have no value at all and just occupy space. While at it tidy up some of the comments and remove a stale one.
--- include/linux/hrtimer.h | 2 -- kernel/time/clockevents.c | 2 -- kernel/time/clocksource.c | 5 ----- kernel/time/hrtimer.c | 16 ++++------------ kernel/time/itimer.c | 2 -- kernel/time/jiffies.c | 2 -- kernel/time/posix-clock.c | 2 +- kernel/time/posix-timers.c | 4 ---- kernel/time/sched_clock.c | 4 ++-- kernel/time/tick-broadcast-hrtimer.c | 4 +--- kernel/time/tick-broadcast.c | 2 -- kernel/time/tick-common.c | 2 -- kernel/time/tick-oneshot.c | 2 -- kernel/time/tick-sched.c | 2 -- kernel/time/time.c | 12 ++++-------- kernel/time/timecounter.c | 6 +----- kernel/time/timekeeping.c | 10 ++-------- kernel/time/timer.c | 2 -- kernel/time/timer_list.c | 2 -- 19 files changed, 15 insertions(+), 68 deletions(-)
include/linux/hrtimer.h +0 -2
@@ -1,6 +1,4 @@/* -* include/linux/hrtimer.h -* * hrtimers - High-resolution kernel timers * * Copyright(C) 2005, Thomas Gleixner <[email protected]>
kernel/time/clockevents.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/clockevents.c -* * This file contains functions which manage clock event devices. * * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
kernel/time/clocksource.c +0 -5
@@ -1,6 +1,4 @@/* -* linux/kernel/time/clocksource.c -* * This file contains the functions which manage clocksource drivers. * * Copyright (C) 2004, 2005 IBM, John Stultz ([email protected])
@@ -18,9 +16,6 @@* You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* -* TODO WishList: -* o Allow clocksource drivers to be unregistered */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
kernel/time/hrtimer.c +4 -12
@@ -1,26 +1,18 @@/* -* linux/kernel/hrtimer.c -* * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007 Timesys Corp., Thomas Gleixner * * High-resolution kernel timers * -* In contrast to the low-resolution timeout API implemented in -* kernel/timer.c, hrtimers provide finer resolution and accuracy -* depending on system configuration and capabilities. -* -* These timers are currently used for: -* - itimers -* - POSIX timers -* - nanosleep -* - precise in-kernel timing +* In contrast to the low-resolution timeout API, aka timer wheel, +* hrtimers provide finer resolution and accuracy depending on system +* configuration and capabilities. * * Started by: Thomas Gleixner and Ingo Molnar * * Credits: -* based on kernel/timer.c +* Based on the original timer wheel code * * Help, testing, suggestions, bugfixes, improvements were * provided by:
kernel/time/itimer.c +0 -2
@@ -1,7 +1,5 @@// SPDX-License-Identifier: GPL-2.0 /* -* linux/kernel/itimer.c -* * Copyright (C) 1992 Darren Senn */
kernel/time/jiffies.c +0 -2
@@ -1,6 +1,4 @@/*********************************************************************** -* linux/kernel/time/jiffies.c -* * This file contains the jiffies based clocksource. * * Copyright (C) 2004, 2005 IBM, John Stultz ([email protected])
kernel/time/posix-clock.c +1 -1
@@ -1,5 +1,5 @@/* -* posix-clock.c - support for dynamic clock devices +* Support for dynamic clock devices * * Copyright (C) 2010 OMICRON electronics GmbH *
kernel/time/posix-timers.c +0 -4
@@ -1,10 +1,6 @@/* -* linux/kernel/posix-timers.c -* -* * 2002-10-15 Posix Clocks & timers * by George Anzinger [email protected] -* * Copyright (C) 2002 2003 by MontaVista Software. * * 2004-06-01 Fix CLOCK_REALTIME clock/timer TIMER_ABSTIME bug.
kernel/time/sched_clock.c +2 -2
@@ -1,6 +1,6 @@/* -* sched_clock.c: Generic sched_clock() support, to extend low level -* hardware time counters to full 64-bit ns values. +* Generic sched_clock() support, to extend low level hardware time +* counters to full 64-bit ns values. * * 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
kernel/time/tick-broadcast-hrtimer.c +1 -3
@@ -1,8 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* linux/kernel/time/tick-broadcast-hrtimer.c -* This file emulates a local clock event device -* via a pseudo clock device. +* Emulate a local clock event device via a pseudo clock device. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/tick-broadcast.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/tick-broadcast.c -* * This file contains functions which emulate a local clock-event * device via a broadcast event source. *
kernel/time/tick-common.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/tick-common.c -* * This file contains the base functions to manage periodic tick * related events. *
kernel/time/tick-oneshot.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/tick-oneshot.c -* * This file contains functions which manage high resolution tick * related events. *
kernel/time/tick-sched.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/time/tick-sched.c -* * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007 Timesys Corp., Thomas Gleixner
kernel/time/time.c +4 -8
@@ -1,14 +1,10 @@/* -* linux/kernel/time.c -* * Copyright (C) 1991, 1992 Linus Torvalds * -* This file contains the interface functions for the various -* time related system calls: time, stime, gettimeofday, settimeofday, -* adjtime -*/ -/* -* Modification history kernel/time.c +* This file contains the interface functions for the various time related +* system calls: time, stime, gettimeofday, settimeofday, adjtime +* +* Modification history: * * 1993-09-02 Philip Gladstone * Created file with time related functions from sched/core.c and adjtimex()
kernel/time/timecounter.c +1 -5
@@ -1,8 +1,5 @@/* -* linux/kernel/time/timecounter.c -* -* based on code that migrated away from -* linux/kernel/time/clocksource.c +* Based on clocksource code. See commit 74d23cc704d1 * * 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
@@ -14,7 +11,6 @@* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include <linux/export.h> #include <linux/timecounter.h>
kernel/time/timekeeping.c +2 -8
@@ -1,13 +1,7 @@/* -* linux/kernel/time/timekeeping.c -* -* Kernel timekeeping code and accessor functions -* -* This code was moved from linux/kernel/timer.c. -* Please see that file for copyright and history logs. -* +* Kernel timekeeping code and accessor functions. Based on code from +* timer.c, moved in commit 8524070b7982. */ -#include <linux/timekeeper_internal.h> #include <linux/module.h> #include <linux/interrupt.h>
kernel/time/timer.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/kernel/timer.c -* * Kernel internal timers * * Copyright (C) 1991, 1992 Linus Torvalds
kernel/time/timer_list.c +0 -2
@@ -1,6 +1,4 @@/* -* kernel/time/timer_list.c -* * List pending timers * * Copyright(C) 2006, Red Hat, Inc., Ingo Molnar
PATCH 2/9 time: Add SPDX license identifiers
In reply to Thomas GleixnerUpdate the time(r) core files files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.
The following files do not contain any direct license information and have been omitted from the big initial SPDX changes:
timeconst.bc: The .bc files were not touched
time.c, timer.c, timekeeping.c: Licence was deduced from EXPORT_SYMBOL_GPL
As those files do not contain direct license references they fall under the project license, i.e. GPL V2 only.
--- include/linux/hrtimer.h | 1 + kernel/time/alarmtimer.c | 1 + kernel/time/clockevents.c | 1 + kernel/time/clocksource.c | 1 + kernel/time/hrtimer.c | 1 + kernel/time/jiffies.c | 1 + kernel/time/posix-clock.c | 1 + kernel/time/posix-stubs.c | 1 + kernel/time/posix-timers.c | 1 + kernel/time/sched_clock.c | 1 + kernel/time/test_udelay.c | 1 + kernel/time/tick-broadcast.c | 1 + kernel/time/tick-common.c | 1 + kernel/time/tick-oneshot.c | 1 + kernel/time/tick-sched.c | 1 + kernel/time/time.c | 1 + kernel/time/timeconst.bc | 2 ++ kernel/time/timeconv.c | 1 + kernel/time/timecounter.c | 1 + kernel/time/timekeeping.c | 1 + kernel/time/timekeeping_debug.c | 1 + kernel/time/timer.c | 1 + kernel/time/timer_list.c | 1 + 23 files changed, 24 insertions(+)
include/linux/hrtimer.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * hrtimers - High-resolution kernel timers *
kernel/time/alarmtimer.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Alarmtimer interface *
kernel/time/clockevents.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file contains functions which manage clock event devices. *
kernel/time/clocksource.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file contains the functions which manage clocksource drivers. *
kernel/time/hrtimer.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
kernel/time/jiffies.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /*********************************************************************** * This file contains the jiffies based clocksource. *
kernel/time/posix-clock.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Support for dynamic clock devices *
kernel/time/posix-stubs.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Dummy stubs used when CONFIG_POSIX_TIMERS=n *
kernel/time/posix-timers.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * 2002-10-15 Posix Clocks & timers * by George Anzinger [email protected]
kernel/time/sched_clock.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic sched_clock() support, to extend low level hardware time * counters to full 64-bit ns values.
kernel/time/test_udelay.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * udelay() test kernel module *
kernel/time/tick-broadcast.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file contains functions which emulate a local clock-event * device via a broadcast event source.
kernel/time/tick-common.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file contains the base functions to manage periodic tick * related events.
kernel/time/tick-oneshot.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file contains functions which manage high resolution tick * related events.
kernel/time/tick-sched.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
kernel/time/time.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 1991, 1992 Linus Torvalds *
kernel/time/timeconst.bc +2 -0
@@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + scale=0 define gcd(a,b) {
kernel/time/timeconv.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: LGPL-2.0+ /* * Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. * This file is part of the GNU C Library.
kernel/time/timecounter.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Based on clocksource code. See commit 74d23cc704d1 *
kernel/time/timekeeping.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Kernel timekeeping code and accessor functions. Based on code from * timer.c, moved in commit 8524070b7982.
kernel/time/timekeeping_debug.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * debugfs file to track time spent in suspend *
kernel/time/timer.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Kernel internal timers *
kernel/time/timer_list.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * List pending timers *
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] time: Add SPDX license identifiers
time: Add SPDX license identifiers
Commit-ID: 35728b8209ee7d25b6241a56304ee926469bd154 Gitweb: https://git.kernel.org/tip/35728b8209ee7d25b6241a56304ee926469bd154 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 31 Oct 2018 19:21:09 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Nov 2018 11:51:20 +0100
time: Add SPDX license identifiers
Update the time(r) core files files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.
The following files do not contain any direct license information and have been omitted from the big initial SPDX changes:
timeconst.bc: The .bc files were not touched
time.c, timer.c, timekeeping.c: Licence was deduced from EXPORT_SYMBOL_GPL
As those files do not contain direct license references they fall under the project license, i.e. GPL V2 only.
--- include/linux/hrtimer.h | 1 + kernel/time/alarmtimer.c | 1 + kernel/time/clockevents.c | 1 + kernel/time/clocksource.c | 1 + kernel/time/hrtimer.c | 1 + kernel/time/jiffies.c | 1 + kernel/time/posix-clock.c | 1 + kernel/time/posix-stubs.c | 1 + kernel/time/posix-timers.c | 1 + kernel/time/sched_clock.c | 1 + kernel/time/test_udelay.c | 1 + kernel/time/tick-broadcast.c | 1 + kernel/time/tick-common.c | 1 + kernel/time/tick-oneshot.c | 1 + kernel/time/tick-sched.c | 1 + kernel/time/time.c | 1 + kernel/time/timeconst.bc | 2 ++ kernel/time/timeconv.c | 1 + kernel/time/timecounter.c | 1 + kernel/time/timekeeping.c | 1 + kernel/time/timekeeping_debug.c | 1 + kernel/time/timer.c | 1 + kernel/time/timer_list.c | 1 + 23 files changed, 24 insertions(+)
include/linux/hrtimer.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * hrtimers - High-resolution kernel timers *
kernel/time/alarmtimer.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Alarmtimer interface *
kernel/time/clockevents.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file contains functions which manage clock event devices. *
kernel/time/clocksource.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file contains the functions which manage clocksource drivers. *
kernel/time/hrtimer.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
kernel/time/jiffies.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /*********************************************************************** * This file contains the jiffies based clocksource. *
kernel/time/posix-clock.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Support for dynamic clock devices *
kernel/time/posix-stubs.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Dummy stubs used when CONFIG_POSIX_TIMERS=n *
kernel/time/posix-timers.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * 2002-10-15 Posix Clocks & timers * by George Anzinger [email protected]
kernel/time/sched_clock.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic sched_clock() support, to extend low level hardware time * counters to full 64-bit ns values.
kernel/time/test_udelay.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * udelay() test kernel module *
kernel/time/tick-broadcast.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file contains functions which emulate a local clock-event * device via a broadcast event source.
kernel/time/tick-common.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file contains the base functions to manage periodic tick * related events.
kernel/time/tick-oneshot.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * This file contains functions which manage high resolution tick * related events.
kernel/time/tick-sched.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
kernel/time/time.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 1991, 1992 Linus Torvalds *
kernel/time/timeconst.bc +2 -0
@@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + scale=0 define gcd(a,b) {
kernel/time/timeconv.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: LGPL-2.0+ /* * Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. * This file is part of the GNU C Library.
kernel/time/timecounter.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Based on clocksource code. See commit 74d23cc704d1 *
kernel/time/timekeeping.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Kernel timekeeping code and accessor functions. Based on code from * timer.c, moved in commit 8524070b7982.
kernel/time/timekeeping_debug.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * debugfs file to track time spent in suspend *
kernel/time/timer.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Kernel internal timers *
kernel/time/timer_list.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * List pending timers *
Re: [tip:timers/core] time: Add SPDX license identifiers
Quoted 3 lines · tip-bot for Thomas Gleixner
The SPDX
identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
Is the "legally binding shorthand" actually proven anywhere? I am not aware of any case law for this.
Re: [tip:timers/core] time: Add SPDX license identifiers
Quoted 7 lines · Joe Perches
Quoted 3 lines · tip-bot for Thomas Gleixner
The SPDX
identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.Is the "legally binding shorthand" actually proven anywhere? I am not aware of any case law for this.
So is there any case law that supports this "legally binding" statement or is it merely wishful thinking?
PATCH 3/9 hrtimers/tick/clockevents: Remove sloppy license references
In reply to Thomas Gleixner"For licencing details see kernel-base/COPYING" and similar license references have no value over the SPDX identifier. Remove them.
--- include/linux/hrtimer.h | 2 -- kernel/time/clockevents.c | 3 --- kernel/time/hrtimer.c | 2 -- kernel/time/tick-broadcast.c | 3 --- kernel/time/tick-common.c | 3 --- kernel/time/tick-oneshot.c | 3 --- kernel/time/tick-sched.c | 2 -- kernel/time/timer_list.c | 4 ---- 8 files changed, 22 deletions(-)
include/linux/hrtimer.h +0 -2
@@ -8,8 +8,6 @@* data type definitions, declarations, prototypes * * Started by: Thomas Gleixner and Ingo Molnar -* -* For licencing details see kernel-base/COPYING */ #ifndef _LINUX_HRTIMER_H#define _LINUX_HRTIMER_H
kernel/time/clockevents.c +0 -3
@@ -5,9 +5,6 @@* Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner -* -* This code is licenced under the GPL version 2. For details see -* kernel-base/COPYING. */ #include <linux/clockchips.h>
kernel/time/hrtimer.c +0 -2
@@ -20,8 +20,6 @@* * George Anzinger, Andrew Morton, Steven Rostedt, Roman Zippel * et. al. -* -* For licencing details see kernel-base/COPYING */ #include <linux/cpu.h>
kernel/time/tick-broadcast.c +0 -3
@@ -6,9 +6,6 @@* Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner -* -* This code is licenced under the GPL version 2. For details see -* kernel-base/COPYING. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/tick-common.c +0 -3
@@ -6,9 +6,6 @@* Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner -* -* This code is licenced under the GPL version 2. For details see -* kernel-base/COPYING. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/tick-oneshot.c +0 -3
@@ -6,9 +6,6 @@* Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner -* -* This code is licenced under the GPL version 2. For details see -* kernel-base/COPYING. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/tick-sched.c +0 -2
@@ -7,8 +7,6 @@* No idle tick implementation for low and high resolution timers * * Started by: Thomas Gleixner and Ingo Molnar -* -* Distribute under GPLv2. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/timer_list.c +0 -4
@@ -3,10 +3,6 @@* List pending timers * * Copyright(C) 2006, Red Hat, Inc., Ingo Molnar -* -* 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/proc_fs.h>
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] hrtimers/tick/clockevents: Remove sloppy license references
hrtimers/tick/clockevents: Remove sloppy license references
Commit-ID: f49c174b5f431db9fa17315269e288d4548b651c Gitweb: https://git.kernel.org/tip/f49c174b5f431db9fa17315269e288d4548b651c Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 31 Oct 2018 19:21:10 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Nov 2018 11:51:21 +0100
hrtimers/tick/clockevents: Remove sloppy license references
"For licencing details see kernel-base/COPYING" and similar license references have no value over the SPDX identifier. Remove them.
--- include/linux/hrtimer.h | 2 -- kernel/time/clockevents.c | 3 --- kernel/time/hrtimer.c | 2 -- kernel/time/tick-broadcast.c | 3 --- kernel/time/tick-common.c | 3 --- kernel/time/tick-oneshot.c | 3 --- kernel/time/tick-sched.c | 2 -- kernel/time/timer_list.c | 4 ---- 8 files changed, 22 deletions(-)
include/linux/hrtimer.h +0 -2
@@ -8,8 +8,6 @@* data type definitions, declarations, prototypes * * Started by: Thomas Gleixner and Ingo Molnar -* -* For licencing details see kernel-base/COPYING */ #ifndef _LINUX_HRTIMER_H#define _LINUX_HRTIMER_H
kernel/time/clockevents.c +0 -3
@@ -5,9 +5,6 @@* Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner -* -* This code is licenced under the GPL version 2. For details see -* kernel-base/COPYING. */ #include <linux/clockchips.h>
kernel/time/hrtimer.c +0 -2
@@ -20,8 +20,6 @@* * George Anzinger, Andrew Morton, Steven Rostedt, Roman Zippel * et. al. -* -* For licencing details see kernel-base/COPYING */ #include <linux/cpu.h>
kernel/time/tick-broadcast.c +0 -3
@@ -6,9 +6,6 @@* Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner -* -* This code is licenced under the GPL version 2. For details see -* kernel-base/COPYING. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/tick-common.c +0 -3
@@ -6,9 +6,6 @@* Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner -* -* This code is licenced under the GPL version 2. For details see -* kernel-base/COPYING. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/tick-oneshot.c +0 -3
@@ -6,9 +6,6 @@* Copyright(C) 2005-2006, Thomas Gleixner <[email protected]> * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner -* -* This code is licenced under the GPL version 2. For details see -* kernel-base/COPYING. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/tick-sched.c +0 -2
@@ -7,8 +7,6 @@* No idle tick implementation for low and high resolution timers * * Started by: Thomas Gleixner and Ingo Molnar -* -* Distribute under GPLv2. */ #include <linux/cpu.h> #include <linux/err.h>
kernel/time/timer_list.c +0 -4
@@ -3,10 +3,6 @@* List pending timers * * Copyright(C) 2006, Red Hat, Inc., Ingo Molnar -* -* 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/proc_fs.h>
PATCH 4/9 time/debug: Remove license boilerplate
In reply to Thomas GleixnerThe SPDX identifier is enough. Remove the license boilerplate.
--- kernel/time/test_udelay.c | 9 --------- kernel/time/timekeeping_debug.c | 10 ---------- 2 files changed, 19 deletions(-)
kernel/time/test_udelay.c +0 -9
@@ -8,15 +8,6 @@* Specifying usecs of 0 or negative values will run multiples tests. * * Copyright (C) 2014 Google, Inc. -* -* This software is licensed under the terms of the GNU General Public -* License version 2, as published by the Free Software Foundation, and -* may be copied, distributed, and modified under those terms. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #include <linux/debugfs.h>
kernel/time/timekeeping_debug.c +0 -10
@@ -3,16 +3,6 @@* debugfs file to track time spent in suspend * * Copyright (c) 2011, Google, Inc. -* -* 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. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. */ #include <linux/debugfs.h>
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] time/debug: Remove license boilerplate
time/debug: Remove license boilerplate
Commit-ID: 9281a7857b91cf4d283be7c86d80e5d091bfb3d9 Gitweb: https://git.kernel.org/tip/9281a7857b91cf4d283be7c86d80e5d091bfb3d9 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 31 Oct 2018 19:21:11 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Nov 2018 11:51:21 +0100
time/debug: Remove license boilerplate
The SPDX identifier is enough. Remove the license boilerplate.
--- kernel/time/test_udelay.c | 9 --------- kernel/time/timekeeping_debug.c | 10 ---------- 2 files changed, 19 deletions(-)
kernel/time/test_udelay.c +0 -9
@@ -8,15 +8,6 @@* Specifying usecs of 0 or negative values will run multiples tests. * * Copyright (C) 2014 Google, Inc. -* -* This software is licensed under the terms of the GNU General Public -* License version 2, as published by the Free Software Foundation, and -* may be copied, distributed, and modified under those terms. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #include <linux/debugfs.h>
kernel/time/timekeeping_debug.c +0 -10
@@ -3,16 +3,6 @@* debugfs file to track time spent in suspend * * Copyright (c) 2011, Google, Inc. -* -* 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. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. */ #include <linux/debugfs.h>
PATCH 5/9 time: Remove license boilerplate
In reply to Thomas GleixnerThe SPDX identifier defines the license of the files already. No need for the boilerplates.
--- kernel/time/alarmtimer.c | 4 ---- kernel/time/clocksource.c | 14 -------------- kernel/time/jiffies.c | 25 +++++-------------------- kernel/time/timecounter.c | 10 ---------- 4 files changed, 5 insertions(+), 48 deletions(-)
kernel/time/alarmtimer.c +0 -4
@@ -11,10 +11,6 @@* Copyright (C) 2010 IBM Corperation * * Author: John Stultz <[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. */ #include <linux/time.h> #include <linux/hrtimer.h>
kernel/time/clocksource.c +0 -14
@@ -3,20 +3,6 @@* This file contains the functions which manage clocksource drivers. * * Copyright (C) 2004, 2005 IBM, John Stultz ([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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
kernel/time/jiffies.c +5 -20
@@ -1,24 +1,9 @@// SPDX-License-Identifier: GPL-2.0+ -/*********************************************************************** -* This file contains the jiffies based clocksource. -* -* Copyright (C) 2004, 2005 IBM, John Stultz ([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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* -************************************************************************/ +/* +* This file contains the jiffies based clocksource. +* +* Copyright (C) 2004, 2005 IBM, John Stultz ([email protected]) +*/ #include <linux/clocksource.h> #include <linux/jiffies.h> #include <linux/module.h>
kernel/time/timecounter.c +0 -10
@@ -1,16 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* * Based on clocksource code. See commit 74d23cc704d1 -* -* 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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #include <linux/export.h> #include <linux/timecounter.h>
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] time: Remove license boilerplate
time: Remove license boilerplate
Commit-ID: 6c7811c628a96fe00965622f3aa1cf272cb898f7 Gitweb: https://git.kernel.org/tip/6c7811c628a96fe00965622f3aa1cf272cb898f7 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 31 Oct 2018 19:21:12 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Nov 2018 11:51:21 +0100
time: Remove license boilerplate
The SPDX identifier defines the license of the files already. No need for the boilerplates.
--- kernel/time/alarmtimer.c | 4 ---- kernel/time/clocksource.c | 14 -------------- kernel/time/jiffies.c | 25 +++++-------------------- kernel/time/timecounter.c | 10 ---------- 4 files changed, 5 insertions(+), 48 deletions(-)
kernel/time/alarmtimer.c +0 -4
@@ -11,10 +11,6 @@* Copyright (C) 2010 IBM Corperation * * Author: John Stultz <[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. */ #include <linux/time.h> #include <linux/hrtimer.h>
kernel/time/clocksource.c +0 -14
@@ -3,20 +3,6 @@* This file contains the functions which manage clocksource drivers. * * Copyright (C) 2004, 2005 IBM, John Stultz ([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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
kernel/time/jiffies.c +5 -20
@@ -1,24 +1,9 @@// SPDX-License-Identifier: GPL-2.0+ -/*********************************************************************** -* This file contains the jiffies based clocksource. -* -* Copyright (C) 2004, 2005 IBM, John Stultz ([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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* -************************************************************************/ +/* +* This file contains the jiffies based clocksource. +* +* Copyright (C) 2004, 2005 IBM, John Stultz ([email protected]) +*/ #include <linux/clocksource.h> #include <linux/jiffies.h> #include <linux/module.h>
kernel/time/timecounter.c +0 -10
@@ -1,16 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* * Based on clocksource code. See commit 74d23cc704d1 -* -* 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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #include <linux/export.h> #include <linux/timecounter.h>
PATCH 6/9 posix-timers/stubs: Remove license boilerplate
In reply to Thomas GleixnerThe SPDX identifier defines the license of the file already. No need for the boilerplate.
--- kernel/time/posix-stubs.c | 4 ---- 1 file changed, 4 deletions(-)
kernel/time/posix-stubs.c +0 -4
@@ -4,10 +4,6 @@* * Created by: Nicolas Pitre, July 2016 * Copyright: (C) 2016 Linaro Limited -* -* 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/linkage.h>
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] posix-timers/stubs: Remove license boilerplate
posix-timers/stubs: Remove license boilerplate
Commit-ID: 3c8f2515ac0a986c8af6ba17c376f874306e71f4 Gitweb: https://git.kernel.org/tip/3c8f2515ac0a986c8af6ba17c376f874306e71f4 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 31 Oct 2018 19:21:13 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Nov 2018 11:51:21 +0100
posix-timers/stubs: Remove license boilerplate
The SPDX identifier defines the license of the file already. No need for the boilerplate.
--- kernel/time/posix-stubs.c | 4 ---- 1 file changed, 4 deletions(-)
kernel/time/posix-stubs.c +0 -4
@@ -4,10 +4,6 @@* * Created by: Nicolas Pitre, July 2016 * Copyright: (C) 2016 Linaro Limited -* -* 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/linkage.h>
PATCH 7/9 sched/clock: Remove license boilerplate
In reply to Thomas GleixnerThe SPDX identifier defines the license of the file already. No need for the boilerplate.
--- kernel/time/sched_clock.c | 4 ---- 1 file changed, 4 deletions(-)
kernel/time/sched_clock.c +0 -4
@@ -2,10 +2,6 @@/* * Generic sched_clock() support, to extend low level hardware time * counters to full 64-bit ns values. -* -* 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/clocksource.h> #include <linux/init.h>
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] sched/clock: Remove license boilerplate
sched/clock: Remove license boilerplate
Commit-ID: 2fa6d420c22268b30dc46c8cbfe8bec0e361e03e Gitweb: https://git.kernel.org/tip/2fa6d420c22268b30dc46c8cbfe8bec0e361e03e Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 31 Oct 2018 19:21:14 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Nov 2018 11:51:22 +0100
sched/clock: Remove license boilerplate
The SPDX identifier defines the license of the file already. No need for the boilerplate.
--- kernel/time/sched_clock.c | 4 ---- 1 file changed, 4 deletions(-)
kernel/time/sched_clock.c +0 -4
@@ -2,10 +2,6 @@/* * Generic sched_clock() support, to extend low level hardware time * counters to full 64-bit ns values. -* -* 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/clocksource.h> #include <linux/init.h>
PATCH 8/9 posix-clocks: Remove license boiler plate
In reply to Thomas GleixnerThe SPDX identifier defines the license of the file already. No need for the boilerplate.
---
@Richard: This file is (C) OMICRON, but I don't have a contact anymore. That Cochran dude is not longer working there :)
Do you have a contact? If so, can you please reply to this mail and Cc him/her.
--- kernel/time/posix-clock.c | 14 -------------- 1 file changed, 14 deletions(-)
kernel/time/posix-clock.c +0 -14
@@ -3,20 +3,6 @@* Support for dynamic clock devices * * Copyright (C) 2010 OMICRON electronics GmbH -* -* 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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <linux/device.h> #include <linux/export.h>
Re: [patch 8/9] posix-clocks: Remove license boiler plate
Quoted 5 lines · Thomas Gleixner
The SPDX identifier defines the license of the file already. No need for the boilerplate.
Signed-off-by Thomas Gleixner <[email protected]>Cc Richard Cochran <[email protected]>
Quoted 7 lines
---
@Richard: This file is (C) OMICRON, but I don't have a contact anymore. That Cochran dude is not longer working there :)
Do you have a contact? If so, can you please reply to this mail and Cc him/her.
@Cristian and Manfred:
We want to replace the license boilerplate with SPDX tags. The file, kernel/time/posix-clock.c, is copyrighted by omicron, and so we need your okay. All that is needed is a reply to this email with an omicron Acked-by tag, like this:
Thanks,
Richard
Quoted 30 lines
--- kernel/time/posix-clock.c | 14 -------------- 1 file changed, 14 deletions(-)kernel/time/posix-clock.c +0
-14@@ -3,20 +3,6 @@* Support for dynamic clock devices * * Copyright (C) 2010 OMICRON electronics GmbH -* -* 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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <linux/device.h> #include <linux/export.h>
Manfred Rudigier
Acked-byRE: [patch 8/9] posix-clocks: Remove license boiler plate
Regards,
Manfred
Quoted 67 lines
-----Original Message-----
From: Richard Cochran <[email protected]>
Sent: Thursday, November 1, 2018 3:12 AM
To: Thomas Gleixner <[email protected]>
Cc: LKML <[email protected]>; Cristian Marinescu <[email protected]>; Manfred Rudigier <[email protected]>
Subject: Re: [patch 8/9] posix-clocks: Remove license boiler plateQuoted 5 lines · Thomas Gleixner
The SPDX identifier defines the license of the file already. No need for the boilerplate.
Signed-off-by Thomas Gleixner <[email protected]>Cc Richard Cochran <[email protected]>Quoted 7 lines
---
@Richard: This file is (C) OMICRON, but I don't have a contact anymore. That Cochran dude is not longer working there :)
Do you have a contact? If so, can you please reply to this mail and Cc him/her.
@Cristian and Manfred:
We want to replace the license boilerplate with SPDX tags. The file,
kernel/time/posix-clock.c, is copyrighted by omicron, and so we need your okay. All that is needed is a reply to this email with an omicron Acked-by tag, like this:Acked-by Richard Cochran <[email protected]>Thanks,
RichardQuoted 32 lines
--- kernel/time/posix-clock.c | 14 -------------- 1 file changed, 14 deletions(-)kernel/time/posix-clock.c +0
-2@@ -3,20 +3,6 @@* Support for dynamic clock devices * * Copyright (C) 2010 OMICRON electronics GmbH -* -* 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.
- *- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.*/
#include <linux/device.h>
#include <linux/export.h>
RE: [patch 8/9] posix-clocks: Remove license boiler plate
Quoted 1 line · Manfred Rudigier
Acked-by Manfred Rudigier <[email protected]>
Thanks Manfred! Very appreciated!
Thomas
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] posix-clocks: Remove license boiler plate
In reply to Thomas Gleixnerposix-clocks: Remove license boiler plate
Commit-ID: c804efeb58229e6040b9a200cbab1fc8c150f99d Gitweb: https://git.kernel.org/tip/c804efeb58229e6040b9a200cbab1fc8c150f99d Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 31 Oct 2018 19:21:15 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Nov 2018 11:51:22 +0100
posix-clocks: Remove license boiler plate
The SPDX identifier defines the license of the file already. No need for the boilerplate.
--- kernel/time/posix-clock.c | 14 -------------- 1 file changed, 14 deletions(-)
kernel/time/posix-clock.c +0 -14
@@ -3,20 +3,6 @@* Support for dynamic clock devices * * Copyright (C) 2010 OMICRON electronics GmbH -* -* 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. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <linux/device.h> #include <linux/export.h>
PATCH 9/9 posix-timers: Remove license boilerplate
In reply to Thomas GleixnerThe SPDX identifier defines the license of the file already. No need for the boilerplate.
Remove also the completely outdated Montavista snail mail address.
--- kernel/time/posix-timers.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
kernel/time/posix-timers.c +1 -19
@@ -7,25 +7,7 @@* 2004-06-01 Fix CLOCK_REALTIME clock/timer TIMER_ABSTIME bug. * Copyright (C) 2004 Boris Hu * -* 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. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* -* MontaVista Software | 1237 East Arques Avenue | Sunnyvale | CA 94085 | USA -*/ - -/* These are all the functions necessary to implement -* POSIX clocks & timers +* These are all the functions necessary to implement POSIX clocks & timers */ #include <linux/mm.h> #include <linux/interrupt.h>
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] posix-timers: Remove license boilerplate
posix-timers: Remove license boilerplate
Commit-ID: 0141de741e0710d5e2e68087577329606f59ed71 Gitweb: https://git.kernel.org/tip/0141de741e0710d5e2e68087577329606f59ed71 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 31 Oct 2018 19:21:16 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 23 Nov 2018 11:51:22 +0100
posix-timers: Remove license boilerplate
The SPDX identifier defines the license of the file already. No need for the boilerplate.
Remove also the completely outdated Montavista snail mail address.
--- kernel/time/posix-timers.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
kernel/time/posix-timers.c +1 -19
@@ -7,25 +7,7 @@* 2004-06-01 Fix CLOCK_REALTIME clock/timer TIMER_ABSTIME bug. * Copyright (C) 2004 Boris Hu * -* 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. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* -* MontaVista Software | 1237 East Arques Avenue | Sunnyvale | CA 94085 | USA -*/ - -/* These are all the functions necessary to implement -* POSIX clocks & timers +* These are all the functions necessary to implement POSIX clocks & timers */ #include <linux/mm.h> #include <linux/interrupt.h>
Quoted 9 lines · Thomas Gleixner
Add SPDX identifiers to all files in kernel/time and remove the license boiler plates.
Aside of that use the chance to get rid of (stale) file references and tidy up the top of file comments as they are touched anyway by this work.
This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.
Looks ok by me.
thanks
-john
Quoted 9 lines · Thomas Gleixner
Add SPDX identifiers to all files in kernel/time and remove the license boiler plates.
Aside of that use the chance to get rid of (stale) file references and tidy up the top of file comments as they are touched anyway by this work.
This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.
Looks good! I need to do this for some of my trees too... too much boilerplate in the tree! :)
Signature · 1 line
Kees Cook
Quoted 11 lines · Thomas Gleixner
Add SPDX identifiers to all files in kernel/time and remove the license boiler plates.
Aside of that use the chance to get rid of (stale) file references and tidy up the top of file comments as they are touched anyway by this work.
This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.
Thanks,
Changes to posix-stubs.c (the only file I authored) look fine to me.
Nicolas
Quoted 10 lines · Thomas Gleixner
Add SPDX identifiers to all files in kernel/time and remove the license boiler plates.
Aside of that use the chance to get rid of (stale) file references and tidy up the top of file comments as they are touched anyway by this work.
This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.
Wow, Arques Ave. That was about five moves ago.
Anyway, this looks good to me. Thanks.
-corey
Quoted 33 lines · Thomas Gleixner
Add SPDX identifiers to all files in kernel/time and remove the license boiler plates.
Aside of that use the chance to get rid of (stale) file references and tidy up the top of file comments as they are touched anyway by this work.
This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.
Thanks,
tglx
--- include/linux/hrtimer.h | 5 +---- kernel/time/alarmtimer.c | 5 +---- kernel/time/clockevents.c | 6 +----- kernel/time/clocksource.c | 20 +------------------- kernel/time/hrtimer.c | 19 +++++-------------- kernel/time/itimer.c | 2 -- kernel/time/jiffies.c | 28 ++++++---------------------- kernel/time/posix-clock.c | 17 ++--------------- kernel/time/posix-stubs.c | 5 +---- kernel/time/posix-timers.c | 25 ++----------------------- kernel/time/sched_clock.c | 9 +++------ kernel/time/test_udelay.c | 10 +--------- kernel/time/tick-broadcast-hrtimer.c | 4 +--- kernel/time/tick-broadcast.c | 6 +----- kernel/time/tick-common.c | 6 +----- kernel/time/tick-oneshot.c | 6 +----- kernel/time/tick-sched.c | 5 +---- kernel/time/time.c | 13 +++++--------
Quoted 8 lines
kernel/time/timeconst.bc | 2 ++ kernel/time/timeconv.c | 1 + kernel/time/timecounter.c | 17 ++--------------- kernel/time/timekeeping.c | 11 +++-------- kernel/time/timekeeping_debug.c | 11 +---------- kernel/time/timer.c | 3 +-- kernel/time/timer_list.c | 7 +------ 25 files changed, 45 insertions(+), 198 deletions(-)
Thanks,
Ingo