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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 457B6C04AAC for ; Tue, 21 May 2019 00:42:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F337921479 for ; Tue, 21 May 2019 00:42:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558399349; bh=Oj6HNiQab0lCVkAZy4WPT7uLKSmz+tOEInKD8qoWFiQ=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=RG2pWm+NXb2tfq+BY/AkKsPlfPdMpmkPuBJ7Rij7J+WYE1XKzeBbxtAoT+h4S9h4p IXEq7eakXmswtESOULcsYAp0AOZn2z+JJg9+kp8mX+467qvi8kPgbazLKiwqV5Nz4W pJscv/BebiENFGUaGSU5nMDjmWfYkVjKo9flvNLw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726928AbfEUAm2 (ORCPT ); Mon, 20 May 2019 20:42:28 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:38531 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727257AbfEUAm2 (ORCPT ); Mon, 20 May 2019 20:42:28 -0400 Received: by mail-lj1-f195.google.com with SMTP id 14so14192586ljj.5 for ; Mon, 20 May 2019 17:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=z72LAlLi5rk0mMy2TpjdLIP2X078yWI0cK010o8KU48=; b=SQWZiGYB3WOZ3vubcJ/4l2WB37LI1lSVsO2Ymbq52mZmcr9W4ox7GiHu6rg2PuWKQK /yMUOYihp3hjIg/7TkWJVJjLauwB3HDbjKFJyrn++dMfbIytRQxGo1SElpUbqZLJLER+ DZmogMPtuPpk+G8aQgNAYFOUAAFD9CZFHMcy8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=z72LAlLi5rk0mMy2TpjdLIP2X078yWI0cK010o8KU48=; b=QX686mJumerCsV5Q6bLOioAXNhK3XelFfME82TAUrJCqGeALJMWOvEEHT1roH14qkL rc8scuIoxolPxXlM+WyBlaIPDWAirUxcxTAMlTuhAgauxp6MQFqoRL8hTImJGHR4Hkzt YVk4CR30ip5xx30+acS2JeQIC5NPYYDsobQYC2Kq4eyLgYxshde9nCcQmqroJ33Fh29F 9ngbnsJ3i1TF5mU55r1OLWFiAI/lWa2eHnvNoH5kwRW0gRwVqATKetxJY14J84sXEuIC dtrJqeFIeJ2dtwnhhK6nhcmVwy/q4YcNX96VXAz2lAtTlPhAKZlUcDwAQKEQBZLBKgzf mQEw== X-Gm-Message-State: APjAAAVHTSufS/4kzDNb4mDFLdzkyuP+21rmir8BQkpH9XNfuIpVxwoP 0J4VGl7vSdaz09XdQ8JqA5uWuYRG3i3HVFov0x70rs7uoRU= X-Google-Smtp-Source: APXvYqyRV1O0GArcwM3j7wuWzWU1DKMAxogonLqcmkF5I+Qebn+ExlEAFMeZsEQ9DxAr/qnMf1rtVhusWQwaTQwC8gM= X-Received: by 2002:a2e:5d4f:: with SMTP id r76mr23657330ljb.49.1558399345639; Mon, 20 May 2019 17:42:25 -0700 (PDT) MIME-Version: 1.0 References: <20190520170750.949430150@linutronix.de> <20190520170858.008906948@linutronix.de> In-Reply-To: <20190520170858.008906948@linutronix.de> From: Kate Stewart Date: Mon, 20 May 2019 19:42:13 -0500 Message-ID: Subject: Re: [patch 16/25] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 41 To: Thomas Gleixner Cc: linux-spdx@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-spdx-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spdx@vger.kernel.org Hi Thomas, You might want to tweak this match a bit to include the prior line, otherwise its going to look a bit weird after the patch is applied. Specifically: * This module: - * This module is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. Leaving a dangling "This module:" with nothing following will be a bit weird. Kate On Mon, May 20, 2019 at 12:10 PM Thomas Gleixner wrote: > > Based on 1 normalized pattern(s): > > this module is free software you can redistribute it and or modify > it under the terms of the gnu general public license as published by > the free software foundation either version 2 of the license or at > your option any later version > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-or-later > > has been chosen to replace the boilerplate/reference in 18 file(s). > > Signed-off-by: Thomas Gleixner > Cc: linux-spdx@vger.kernel.org > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch2&id=7aa5fdf75240 > --- > drivers/net/hamradio/bpqether.c | 5 +---- > drivers/net/wan/lapbether.c | 5 +---- > net/lapb/lapb_iface.c | 5 +---- > net/lapb/lapb_in.c | 5 +---- > net/lapb/lapb_out.c | 5 +---- > net/lapb/lapb_subr.c | 5 +---- > net/lapb/lapb_timer.c | 5 +---- > net/x25/af_x25.c | 5 +---- > net/x25/x25_dev.c | 5 +---- > net/x25/x25_facilities.c | 5 +---- > net/x25/x25_forward.c | 5 +---- > net/x25/x25_in.c | 5 +---- > net/x25/x25_link.c | 5 +---- > net/x25/x25_out.c | 5 +---- > net/x25/x25_proc.c | 5 +---- > net/x25/x25_route.c | 5 +---- > net/x25/x25_subr.c | 5 +---- > net/x25/x25_timer.c | 5 +---- > 18 files changed, 18 insertions(+), 72 deletions(-) > > --- a/drivers/net/hamradio/bpqether.c > +++ b/drivers/net/hamradio/bpqether.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * G8BPQ compatible "AX.25 via ethernet" driver release 004 > * > * This code REQUIRES 2.0.0 or higher/ NET3.029 > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * This is a "pseudo" network driver to allow AX.25 over Ethernet > * using G8BPQ encapsulation. It has been extracted from the protocol > --- a/drivers/net/wan/lapbether.c > +++ b/drivers/net/wan/lapbether.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * "LAPB via ethernet" driver release 001 > * > * This code REQUIRES 2.1.15 or higher/ NET3.038 > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * This is a "pseudo" network driver to allow LAPB over Ethernet. > * > --- a/net/lapb/lapb_iface.c > +++ b/net/lapb/lapb_iface.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * LAPB release 002 > * > * This code REQUIRES 2.1.15 or higher/ NET3.038 > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * LAPB 001 Jonathan Naylor Started Coding > --- a/net/lapb/lapb_in.c > +++ b/net/lapb/lapb_in.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * LAPB release 002 > * > * This code REQUIRES 2.1.15 or higher/ NET3.038 > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * LAPB 001 Jonathan Naulor Started Coding > --- a/net/lapb/lapb_out.c > +++ b/net/lapb/lapb_out.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * LAPB release 002 > * > * This code REQUIRES 2.1.15 or higher/ NET3.038 > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * LAPB 001 Jonathan Naylor Started Coding > --- a/net/lapb/lapb_subr.c > +++ b/net/lapb/lapb_subr.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * LAPB release 002 > * > * This code REQUIRES 2.1.15 or higher/ NET3.038 > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * LAPB 001 Jonathan Naylor Started Coding > --- a/net/lapb/lapb_timer.c > +++ b/net/lapb/lapb_timer.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * LAPB release 002 > * > * This code REQUIRES 2.1.15 or higher/ NET3.038 > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * LAPB 001 Jonathan Naylor Started Coding > --- a/net/x25/af_x25.c > +++ b/net/x25/af_x25.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -8,10 +9,6 @@ > * This code REQUIRES 2.1.15 or higher > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * X.25 001 Jonathan Naylor Started coding. > --- a/net/x25/x25_dev.c > +++ b/net/x25/x25_dev.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -7,10 +8,6 @@ > * This code REQUIRES 2.1.15 or higher > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * X.25 001 Jonathan Naylor Started coding. > --- a/net/x25/x25_facilities.c > +++ b/net/x25/x25_facilities.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -8,10 +9,6 @@ > * This code REQUIRES 2.1.15 or higher > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * X.25 001 Split from x25_subr.c > --- a/net/x25/x25_forward.c > +++ b/net/x25/x25_forward.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * 03-01-2007 Added forwarding for x.25 Andrew Hendry > --- a/net/x25/x25_in.c > +++ b/net/x25/x25_in.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -8,10 +9,6 @@ > * This code REQUIRES 2.1.15 or higher > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * X.25 001 Jonathan Naylor Started coding. > --- a/net/x25/x25_link.c > +++ b/net/x25/x25_link.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -8,10 +9,6 @@ > * This code REQUIRES 2.1.15 or higher > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * X.25 001 Jonathan Naylor Started coding. > --- a/net/x25/x25_out.c > +++ b/net/x25/x25_out.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -8,10 +9,6 @@ > * This code REQUIRES 2.1.15 or higher > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * X.25 001 Jonathan Naylor Started coding. > --- a/net/x25/x25_proc.c > +++ b/net/x25/x25_proc.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -8,10 +9,6 @@ > * This code REQUIRES 2.4 with seq_file support > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * 2002/10/06 Arnaldo Carvalho de Melo seq_file support > --- a/net/x25/x25_route.c > +++ b/net/x25/x25_route.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -8,10 +9,6 @@ > * This code REQUIRES 2.1.15 or higher > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * X.25 001 Jonathan Naylor Started coding. > --- a/net/x25/x25_subr.c > +++ b/net/x25/x25_subr.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -8,10 +9,6 @@ > * This code REQUIRES 2.1.15 or higher > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * X.25 001 Jonathan Naylor Started coding. > --- a/net/x25/x25_timer.c > +++ b/net/x25/x25_timer.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * X.25 Packet Layer release 002 > * > @@ -8,10 +9,6 @@ > * This code REQUIRES 2.1.15 or higher > * > * This module: > - * This module is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * as published by the Free Software Foundation; either version > - * 2 of the License, or (at your option) any later version. > * > * History > * X.25 001 Jonathan Naylor Started coding. > > > >