From patchwork Mon Sep 18 10:14:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 141340 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2553661vqi; Mon, 18 Sep 2023 03:29:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHwY5Fbyz7ZweSrUE+y5N3s/JlD6h9CyeWY9YnLYFKy/qF3VPGGrQaYx7PxZD8yPYRS/KGe X-Received: by 2002:a05:6a20:7485:b0:13d:7f7b:1926 with SMTP id p5-20020a056a20748500b0013d7f7b1926mr15000825pzd.11.1695032959329; Mon, 18 Sep 2023 03:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695032959; cv=none; d=google.com; s=arc-20160816; b=zc/FYyRtj2+N/QaJmkbC8dKV7yLAoetDwG2dZepYrZLaxZ/q5Yv/XPR97H786hn0H9 LPLZ66NYwJrmkDcjFQNXepyrU8UyCakemb/wyTTEUPjfh4wQdbN58DlDtVrNUAZiF/1v 6FpmMJbtz3y/B5nPGmOmNv+jeysglxPyVgPU//yuaZr7PVG8jsMYakKjPItWQivVgftn jJM3lWs1pLpe8TzRaSX4upVrX6ZP/AfgvCK6ttQCkm09pIbuefLFQR7hD27/e+X8i+wZ lxZ/sf1mAK8vEA4bkZrgHsOJg5G/OoIw9RzCKs4NbpnC1NgmEJJ1e/D4uxluwDN7ld1S o1yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=MPFwu5rk8Ca+ZH2L4wPT1XhdT/5Zn1hGi4unLxrZJHw=; fh=+jbsKbBvdUh66UV3no+vALHIgVZNY7lMyJiDQtnTw/o=; b=LPuemQHKLCQlAHbKZZDsQrg20OmAK/vF6w85pkLEhueo7hJugU+NSKN++dBREn/W/h t4trUA7Pp2Rz+eQ1k9e4NHmocgAma+kJ0zB0B6x6Bg/5IhRF02Oird0SfYxrcC6JILy+ XZp5EYpgXl7Apc0Qj2iezxl84NYs+Pox92OqCOiiEj1QBuCdUGleLQEIT+aJARV4KWPi YXmS5K3ogMGT70AHjp2b/moP0odKksLNWEAJTP/RSdpe6tPEZR4JzDTNJHaaT/d5f9nq N+slYhQhnWpYDQRi5QOGw7YuqPtT3XYf4tmCQ3Uxekk9wOZ5d3P6cZyWntzTjnXTSzal CmUg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id z37-20020a631925000000b00573f7d09445si7728579pgl.330.2023.09.18.03.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 03:29:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 27623802F956; Mon, 18 Sep 2023 03:16:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239561AbjIRKPQ (ORCPT + 27 others); Mon, 18 Sep 2023 06:15:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239552AbjIRKPC (ORCPT ); Mon, 18 Sep 2023 06:15:02 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 966C4D8 for ; Mon, 18 Sep 2023 03:14:55 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:9622:9b2f:73fd:43ad]) by xavier.telenet-ops.be with bizsmtp id nNEr2A00n4u9dj801NErPt; Mon, 18 Sep 2023 12:14:53 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qiBGw-003wYV-Kt; Mon, 18 Sep 2023 12:14:51 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qiBHH-006GjT-E1; Mon, 18 Sep 2023 12:14:51 +0200 From: Geert Uytterhoeven To: Greg Ungerer , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Thomas Gleixner , Greg Kroah-Hartman Cc: linux-m68k@lists.linux-m68k.org, linuxppc-dev@lists.ozlabs.org, linux-spdx@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 1/2] m68k: Replace GPL 2.0+ README.legal boilerplate with SPDX Date: Mon, 18 Sep 2023 12:14:43 +0200 Message-Id: <23430c233728ab02ec0af8e714994398d383137a.1695031668.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 18 Sep 2023 03:16:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777370880286152171 X-GMAIL-MSGID: 1777370880286152171 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-existent files by replacing the boilerplate with SPDX license identifiers. Signed-off-by: Geert Uytterhoeven Acked-by: Greg Ungerer --- v2: - Add Acked-by, - s/existant/existent/. --- 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(-) 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