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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBEE4C4CECC for ; Mon, 27 Apr 2020 17:42:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD4FD208FE for ; Mon, 27 Apr 2020 17:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726377AbgD0RmD (ORCPT ); Mon, 27 Apr 2020 13:42:03 -0400 Received: from smtprelay0159.hostedemail.com ([216.40.44.159]:35734 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726208AbgD0RmC (ORCPT ); Mon, 27 Apr 2020 13:42:02 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay02.hostedemail.com (Postfix) with ESMTP id ED6CD3CF6; Mon, 27 Apr 2020 17:42:00 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: bee19_2e797eea40b41 X-Filterd-Recvd-Size: 3336 Received: from XPS-9350.home (unknown [47.151.136.130]) (Authenticated sender: joe@perches.com) by omf09.hostedemail.com (Postfix) with ESMTPA; Mon, 27 Apr 2020 17:41:59 +0000 (UTC) Message-ID: <515362d10c06567f35f0d5b7c3f2e121769fb04b.camel@perches.com> Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier From: Joe Perches To: Greg Kroah-Hartman , "Darrick J. Wong" , Linus Torvalds , Kate Stewart Cc: Nishad Kamdar , Uwe =?ISO-8859-1?Q?Kleine-K=F6nig?= , Pengutronix Kernel Team , linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 27 Apr 2020 10:41:58 -0700 In-Reply-To: <20200427172959.GB3936841@kroah.com> References: <20200425133504.GA11354@nishad> <20200427155617.GY6749@magnolia> <20200427172959.GB3936841@kroah.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.36.1-2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2020-04-27 at 19:29 +0200, Greg Kroah-Hartman wrote: > On Mon, Apr 27, 2020 at 08:56:18AM -0700, Darrick J. Wong wrote: > > On Sat, Apr 25, 2020 at 07:05:09PM +0530, Nishad Kamdar wrote: > > > This patch corrects the SPDX License Identifier style in > > > header files related to XFS File System support. > > > For C header files Documentation/process/license-rules.rst > > > mandates C-like comments (opposed to C source files where > > > C++ style should be used). > > > > > > Changes made by using a script provided by Joe Perches here: > > > https://lkml.org/lkml/2019/2/7/46. [] > > > diff --git a/fs/xfs/libxfs/xfs_ag_resv.h b/fs/xfs/libxfs/xfs_ag_resv.h [] > > > @@ -1,4 +1,4 @@ > > > -// SPDX-License-Identifier: GPL-2.0+ > > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > > > I thought we were supposed to use 'GPL-2.0-or-newer' because 'GPL-2.0+' > > is deprecated in some newer version of the SPDX standard? > > > > > > The kernel follows the "older" SPDX standard, but will accept either, > it's up to the author. It is all documented in LICENSES/ if people > really want to make sure. I think the kernel should prefer the "newer" SPDX standard for any/all changes to these lines. --- LICENSES/preferred/GPL-2.0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0 index ff0812..c50f93 100644 --- a/LICENSES/preferred/GPL-2.0 +++ b/LICENSES/preferred/GPL-2.0 @@ -8,13 +8,13 @@ Usage-Guide: tag/value pairs into a comment according to the placement guidelines in the licensing rules documentation. For 'GNU General Public License (GPL) version 2 only' use: - SPDX-License-Identifier: GPL-2.0 - or SPDX-License-Identifier: GPL-2.0-only + or the deprecated alternative + SPDX-License-Identifier: GPL-2.0 For 'GNU General Public License (GPL) version 2 or any later version' use: - SPDX-License-Identifier: GPL-2.0+ - or SPDX-License-Identifier: GPL-2.0-or-later + or the deprecated alternative + SPDX-License-Identifier: GPL-2.0+ License-Text: GNU GENERAL PUBLIC LICENSE