From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E942DEC875F for ; Fri, 8 Sep 2023 02:09:51 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Rhfgy0FHrz3cKV for ; Fri, 8 Sep 2023 12:09:50 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2604:1380:4641:c500::1; helo=dfw.source.kernel.org; envelope-from=srs0=fec8=ey=linux-m68k.org=gerg@kernel.org; receiver=lists.ozlabs.org) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4RhfgM5SXxz2yVN for ; Fri, 8 Sep 2023 12:09:19 +1000 (AEST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3D9DE6118C; Fri, 8 Sep 2023 02:09:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21316C433C7; Fri, 8 Sep 2023 02:09:13 +0000 (UTC) Message-ID: Date: Fri, 8 Sep 2023 12:09:11 +1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 1/2] m68k: Replace GPL 2.0+ README.legal boilerplate by SPDX Content-Language: en-US To: Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Michael Ellerman , Nicholas Piggin , Christophe Leroy References: From: Greg Ungerer In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi Geert, On 8/9/23 00:21, Geert Uytterhoeven wrote: > Upstream Linux never had a "README.legal" file, but it was present > in early source releases of Linux/m68k. It contained a simple copyright > notice and a link to a version of the "COPYING" file that predated the > addition of the "only valid GPL version is v2" clause. > > Get rid of the references to non-existant files by replacing the > boilerplate with SPDX license identifiers. > > Signed-off-by: Geert Uytterhoeven > --- > arch/m68k/68000/entry.S | 7 ++----- > arch/m68k/bvme6000/config.c | 5 +---- > arch/m68k/coldfire/entry.S | 7 ++----- > arch/m68k/ifpsp060/Makefile | 6 ++---- > arch/m68k/kernel/entry.S | 7 ++----- > arch/m68k/kernel/head.S | 8 ++------ > arch/m68k/mvme147/config.c | 5 +---- > arch/m68k/mvme16x/config.c | 5 +---- > arch/m68k/q40/config.c | 5 +---- > 9 files changed, 14 insertions(+), 41 deletions(-) Thank you for taking care of the ColdFire and 68000 ones as well! Acked-by: Greg Ungerer Regards Greg > diff --git a/arch/m68k/68000/entry.S b/arch/m68k/68000/entry.S > index 7d63e2f1555a03dc..72e95663b62ffd54 100644 > --- a/arch/m68k/68000/entry.S > +++ b/arch/m68k/68000/entry.S > @@ -1,12 +1,9 @@ > -/* > +/* SPDX-License-Identifier: GPL-2.0-or-later > + * > * entry.S -- non-mmu 68000 interrupt and exception entry points > * > * Copyright (C) 1991, 1992 Linus Torvalds > * > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file README.legal in the main directory of this archive > - * for more details. > - * > * Linux/m68k support by Hamish Macdonald > */ > > diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c > index e604fe6602461334..8a2ee69a09f6659c 100644 > --- a/arch/m68k/bvme6000/config.c > +++ b/arch/m68k/bvme6000/config.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * arch/m68k/bvme6000/config.c > * > @@ -8,10 +9,6 @@ > * linux/amiga/config.c > * > * Copyright (C) 1993 Hamish Macdonald > - * > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file README.legal in the main directory of this archive > - * for more details. > */ > > #include > diff --git a/arch/m68k/coldfire/entry.S b/arch/m68k/coldfire/entry.S > index 35104c5417ff4d07..4ea08336e2fb0aae 100644 > --- a/arch/m68k/coldfire/entry.S > +++ b/arch/m68k/coldfire/entry.S > @@ -1,4 +1,5 @@ > -/* > +/* SPDX-License-Identifier: GPL-2.0-or-later > + * > * entry.S -- interrupt and exception processing for ColdFire > * > * Copyright (C) 1999-2007, Greg Ungerer (gerg@snapgear.com) > @@ -13,10 +14,6 @@ > * > * Copyright (C) 1991, 1992 Linus Torvalds > * > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file README.legal in the main directory of this archive > - * for more details. > - * > * Linux/m68k support by Hamish Macdonald > * > * 68060 fixes by Jesper Skov > diff --git a/arch/m68k/ifpsp060/Makefile b/arch/m68k/ifpsp060/Makefile > index 56b530a96c2f33b5..00d0621f547ccb93 100644 > --- a/arch/m68k/ifpsp060/Makefile > +++ b/arch/m68k/ifpsp060/Makefile > @@ -1,7 +1,5 @@ > -# Makefile for 680x0 Linux 68060 integer/floating point support package > +# SPDX-License-Identifier: GPL-2.0-or-later > # > -# This file is subject to the terms and conditions of the GNU General Public > -# License. See the file "README.legal" in the main directory of this archive > -# for more details. > +# Makefile for 680x0 Linux 68060 integer/floating point support package > > obj-y := fskeleton.o iskeleton.o os.o > diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S > index 4dd2fd7acba9ea07..3bcdd32a6b36613d 100644 > --- a/arch/m68k/kernel/entry.S > +++ b/arch/m68k/kernel/entry.S > @@ -1,13 +1,10 @@ > -/* -*- mode: asm -*- > +/* SPDX-License-Identifier: GPL-2.0-or-later > + * -*- mode: asm -*- > * > * linux/arch/m68k/kernel/entry.S > * > * Copyright (C) 1991, 1992 Linus Torvalds > * > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file README.legal in the main directory of this archive > - * for more details. > - * > * Linux/m68k support by Hamish Macdonald > * > * 68060 fixes by Jesper Skov > diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S > index 9e812d8606be8301..852255cf60dec132 100644 > --- a/arch/m68k/kernel/head.S > +++ b/arch/m68k/kernel/head.S > @@ -1,4 +1,5 @@ > -/* -*- mode: asm -*- > +/* SPDX-License-Identifier: GPL-2.0-or-later > +** -*- mode: asm -*- > ** > ** head.S -- This file contains the initial boot code for the > ** Linux/68k kernel. > @@ -25,11 +26,6 @@ > ** for linux-2.1.115 > ** 1999/02/11 Richard Zidlicky: added Q40 support (initial version 99/01/01) > ** 2004/05/13 Kars de Jong: Finalised HP300 support > -** > -** This file is subject to the terms and conditions of the GNU General Public > -** License. See the file README.legal in the main directory of this archive > -** for more details. > -** > */ > > /* > diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c > index 7dfacd0b207a9750..8b5dc07f0811f2fc 100644 > --- a/arch/m68k/mvme147/config.c > +++ b/arch/m68k/mvme147/config.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * arch/m68k/mvme147/config.c > * > @@ -7,10 +8,6 @@ > * Based on: > * > * Copyright (C) 1993 Hamish Macdonald > - * > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file README.legal in the main directory of this archive > - * for more details. > */ > > #include > diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c > index 9bb9a33e43c246c4..d1fbd1704d65822f 100644 > --- a/arch/m68k/mvme16x/config.c > +++ b/arch/m68k/mvme16x/config.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * arch/m68k/mvme16x/config.c > * > @@ -8,10 +9,6 @@ > * linux/amiga/config.c > * > * Copyright (C) 1993 Hamish Macdonald > - * > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file README.legal in the main directory of this archive > - * for more details. > */ > > #include > diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c > index 2c51c2b4a4fbbf79..de7870ad2a30620d 100644 > --- a/arch/m68k/q40/config.c > +++ b/arch/m68k/q40/config.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * arch/m68k/q40/config.c > * > @@ -6,10 +7,6 @@ > * originally based on: > * > * linux/bvme/config.c > - * > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file README.legal in the main directory of this archive > - * for more details. > */ > > #include