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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 D45EFC4CECC for ; Mon, 27 Apr 2020 17:46:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADFAD21707 for ; Mon, 27 Apr 2020 17:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588009575; bh=GyOKbULGIjSk5qPc89qgzUXWhIi1IHH3gWYAgn/MlkE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=MdhCdUBEbRCY2sxWnGvTA6u5bKE6nuoiksQnk1p04geUm0LqQQwPAHDrTrfRQmgLy W7aFufoK/xhakectkBnEzsFflLNYpmNbp6B+lwk9avy/5B9Al0Dr1lupuNmHKWlpku pyXMdnqNdOuW/FfAk4OnVuafuJ9UBaXzBP6wDboM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726406AbgD0RqP (ORCPT ); Mon, 27 Apr 2020 13:46:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:54356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725963AbgD0RqO (ORCPT ); Mon, 27 Apr 2020 13:46:14 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B2F0D215A4; Mon, 27 Apr 2020 17:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588009574; bh=GyOKbULGIjSk5qPc89qgzUXWhIi1IHH3gWYAgn/MlkE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WBqXHHkTNUpf+PamSmfO5GQtEYUOcUJRXQ+3jHA2Ya6zlOnh7NUUqJxd18VdXSioF pir5n1Dlnw2cYh54OKsOwpmcbCH4jQSlwk57lI1adufP1suJy/PvZ7r5NeLPN7vpO1 R18PoAhIz1KMqziTwW4YlMsTk/O+QAkpnCPsCt+c= Date: Mon, 27 Apr 2020 19:46:11 +0200 From: Greg Kroah-Hartman To: Joe Perches Cc: "Darrick J. Wong" , Linus Torvalds , Kate Stewart , Nishad Kamdar , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , Pengutronix Kernel Team , linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] xfs: Use the correct style for SPDX License Identifier Message-ID: <20200427174611.GA4035548@kroah.com> References: <20200425133504.GA11354@nishad> <20200427155617.GY6749@magnolia> <20200427172959.GB3936841@kroah.com> <515362d10c06567f35f0d5b7c3f2e121769fb04b.camel@perches.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <515362d10c06567f35f0d5b7c3f2e121769fb04b.camel@perches.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 27, 2020 at 10:41:58AM -0700, Joe Perches wrote: > 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: At the moment, I do not, as the current ones are not "depreciated" at all. thanks, greg k-h