The following commit has been merged into the timers/core branch of tip: Commit-ID: 7160d9c4cce94612d5f42a5db392cd606a38737a Gitweb: https://git.kernel.org/tip/7160d9c4cce94612d5f42a5db392cd606a38737a Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Tue, 10 May 2022 19:24:41 +02:00 Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> CommitterDate: Wed, 18 May 2022 11:08:59 +02:00 clocksource/drivers/armada-370-xp: Convert to SPDX identifier The license information clearly states GPL version 2 only. The extra text which excludes warranties is an excerpt of the corresponding GPLv2 clause 11. So the SPDX identifier covers it completely. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Gregory Clement <gregory.clement@xxxxxxxxxxxxxxxxxx> Cc: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> Acked-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxx> Link: https://lore.kernel.org/r/20220510171254.592781786@xxxxxxxxxxxxx Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> --- drivers/clocksource/timer-armada-370-xp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/clocksource/timer-armada-370-xp.c b/drivers/clocksource/timer-armada-370-xp.c index e3acc3c..6ec565d 100644 --- a/drivers/clocksource/timer-armada-370-xp.c +++ b/drivers/clocksource/timer-armada-370-xp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Marvell Armada 370/XP SoC timer handling. * @@ -7,10 +8,6 @@ * Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx> * Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx> * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - * * Timer 0 is used as free-running clocksource, while timer 1 is * used as clock_event_device. *