by Simon Horman

[permalink] [raw]

2023-05-12 04:11:50

by kernel test robot

[permalink] [raw]

On Fri, May 12, 2023 at 08:57:15AM +0200, Sven-Haegar Koch wrote:
> On Fri, 12 May 2023, Greg Ungerer wrote:
>
> > On 11/5/23 23:34, Bagas Sanjaya wrote:
> > > Replace GPL boilerplate notice on remaining files with appropriate SPDX
> > > tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+.
>
> > > --- a/drivers/net/ethernet/8390/hydra.c
> > > +++ b/drivers/net/ethernet/8390/hydra.c
> > > @@ -1,10 +1,8 @@
> > > +/* SPDX-License-Identifier: GPL-1.0-only */
> > > +
> > > /* New Hydra driver using generic 8390 core */
> > > /* Based on old hydra driver by Topi Kanerva ([email protected]) */
> > > -/* This file is subject to the terms and conditions of the GNU General
> > > */
> > > -/* Public License. See the file COPYING in the main directory of the
> > > */
> > > -/* Linux distribution for more details.
> > > */
> > > -
> > > /* Peter De Schrijver ([email protected]) */
> > > /* Oldenburg 2000 */
>
> GPL-1.0-only does not sound correct.

Oops, my oversight. The boilerplate above should have meant GPL 2.0
only.

Thanks for reminder!

--
An old man doll... just what I always wanted! - Clara

Attachments:

(No filename) (1.14 kB)
signature.asc (235.00 B)
Download all attachments

2023-05-12 09:16:21

by Bagas Sanjaya

[permalink] [raw]

Subject: Re: [PATCH 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier

On 5/11/23 22:08, Guenter Roeck wrote:
>> +/* SPDX-License-Identifier: GPL-2.0-only */
>
> This was supposed to be a C++ style comment for C source files.
> Has the rule changed ?
>

Oops, I don't see checkpatch. Will fix.

>> +/* SPDX-License-Identifier: GPL-2.0-only */
>
> The text below suggests that this should be GPL1+.
>

OK, will fix.

Thanks for review!

--
An old man doll... just what I always wanted! - Clara

2023-05-12 09:30:38

by Bagas Sanjaya

[permalink] [raw]

Subject: Re: [PATCH 00/10] Treewide GPL SPDX conversion (love letter to Didi)

On 5/12/23 07:41, Jakub Kicinski wrote:
> On Thu, 11 May 2023 20:33:56 +0700 Bagas Sanjaya wrote:
>> I trigger this patch series because of Didi's GPL full name fixes
>> attempt [1], for which all of them had been NAKed. In many cases, the
>> appropriate correction is to use SPDX license identifier instead.
>>
>> Often, when replacing license notice boilerplates with their equivalent
>> SPDX identifier, the notice doesn't mention explicit GPL version. Greg
>> [2] replied this question by falling back to GPL 1.0 (more precisely
>> GPL 1.0+ in order to be compatible with GPL 2.0 used by Linux kernel),
>> although there are exceptions (mostly resolved by inferring from
>> older patches covering similar situation).
>
> Should you be CCing linux-spdx@ on this?

Oops, I forgot to Cc that list. Will do in v2.

--
An old man doll... just what I always wanted! - Clara

2023-05-12 13:24:24

by Jan Kara

[permalink] [raw]

Subject: Re: [PATCH 09/10] udf: Replace license notice with SPDX identifier

On Thu 11-05-23 20:34:05, Bagas Sanjaya wrote:
> Except Kconfig and Makefile, all source files for UDF filesystem doesn't
> bear SPDX license identifier. Add appropriate license identifier while
> replacing boilerplates.
>
> Cc: Thomas Gleixner <[email protected]>
> Signed-off-by: Bagas Sanjaya <[email protected]>
> ---
> fs/udf/balloc.c | 6 +-----
> fs/udf/dir.c | 6 +-----
> fs/udf/directory.c | 6 +-----
> fs/udf/ecma_167.h | 24 +-----------------------
> fs/udf/file.c | 6 +-----
> fs/udf/ialloc.c | 6 +-----
> fs/udf/inode.c | 6 +-----
> fs/udf/lowlevel.c | 6 +-----
> fs/udf/misc.c | 6 +-----
> fs/udf/namei.c | 6 +-----
> fs/udf/osta_udf.h | 24 +-----------------------
> fs/udf/partition.c | 6 +-----
> fs/udf/super.c | 6 +-----
> fs/udf/symlink.c | 6 +-----
> fs/udf/truncate.c | 6 +-----
> fs/udf/udftime.c | 19 +------------------
> fs/udf/unicode.c | 6 +-----
> 17 files changed, 17 insertions(+), 134 deletions(-)
>
> diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
> index 14b9db4c80f03f..a56eb6975d19c8 100644
> --- a/fs/udf/balloc.c
> +++ b/fs/udf/balloc.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * balloc.c
> *
> @@ -5,11 +6,6 @@
> * Block allocation handling routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1999-2001 Ben Fennema
> * (C) 1999 Stelias Computing Inc
> *

So the explicit copyright speaks about GPL license but your SPDX identifier
speaks about GPLv2 only. I don't think we can change the license like this?
It applies also to some other UDF files you convert...

Honza

> diff --git a/fs/udf/dir.c b/fs/udf/dir.c
> index 212393b12c2266..015e17382f975e 100644
> --- a/fs/udf/dir.c
> +++ b/fs/udf/dir.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * dir.c
> *
> @@ -5,11 +6,6 @@
> * Directory handling routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1998-2004 Ben Fennema
> *
> * HISTORY
> diff --git a/fs/udf/directory.c b/fs/udf/directory.c
> index 654536d2b60976..3b65d5dc70b008 100644
> --- a/fs/udf/directory.c
> +++ b/fs/udf/directory.c
> @@ -1,14 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * directory.c
> *
> * PURPOSE
> * Directory related functions
> *
> - * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> */
>
> #include "udfdecl.h"
> diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h
> index de17a97e866742..961e7bf5cb5c00 100644
> --- a/fs/udf/ecma_167.h
> +++ b/fs/udf/ecma_167.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: BSD-2-Clause OR GPL-1.0-only */
> /*
> * ecma_167.h
> *
> @@ -8,29 +9,6 @@
> * Copyright (c) 2017-2019 Pali Roh?r <[email protected]>
> * All rights reserved.
> *
> - * Redistribution and use in source and binary forms, with or without
> - * modification, are permitted provided that the following conditions
> - * are met:
> - * 1. Redistributions of source code must retain the above copyright
> - * notice, this list of conditions, and the following disclaimer,
> - * without modification.
> - * 2. The name of the author may not be used to endorse or promote products
> - * derived from this software without specific prior written permission.
> - *
> - * Alternatively, this software may be distributed under the terms of the
> - * GNU Public License ("GPL").
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
> - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
> - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> - * SUCH DAMAGE.
> */
>
> /**
> diff --git a/fs/udf/file.c b/fs/udf/file.c
> index 8238f742377bab..a13622121a63c5 100644
> --- a/fs/udf/file.c
> +++ b/fs/udf/file.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * file.c
> *
> @@ -5,11 +6,6 @@
> * File handling routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1998-1999 Dave Boynton
> * (C) 1998-2004 Ben Fennema
> * (C) 1999-2000 Stelias Computing Inc
> diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
> index 8d50121778a57d..67a869cbf5987b 100644
> --- a/fs/udf/ialloc.c
> +++ b/fs/udf/ialloc.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * ialloc.c
> *
> @@ -5,11 +6,6 @@
> * Inode allocation handling routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1998-2001 Ben Fennema
> *
> * HISTORY
> diff --git a/fs/udf/inode.c b/fs/udf/inode.c
> index 1e71e04ae8f6b9..7c1e083223211c 100644
> --- a/fs/udf/inode.c
> +++ b/fs/udf/inode.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * inode.c
> *
> @@ -5,11 +6,6 @@
> * Inode handling routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1998 Dave Boynton
> * (C) 1998-2004 Ben Fennema
> * (C) 1999-2000 Stelias Computing Inc
> diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c
> index c87ed942d07653..28fc91f12da911 100644
> --- a/fs/udf/lowlevel.c
> +++ b/fs/udf/lowlevel.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * lowlevel.c
> *
> @@ -5,11 +6,6 @@
> * Low Level Device Routines for the UDF filesystem
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1999-2001 Ben Fennema
> *
> * HISTORY
> diff --git a/fs/udf/misc.c b/fs/udf/misc.c
> index 3777468d06ce58..c0eaad4d0d86ff 100644
> --- a/fs/udf/misc.c
> +++ b/fs/udf/misc.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * misc.c
> *
> @@ -5,11 +6,6 @@
> * Miscellaneous routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1998 Dave Boynton
> * (C) 1998-2004 Ben Fennema
> * (C) 1999-2000 Stelias Computing Inc
> diff --git a/fs/udf/namei.c b/fs/udf/namei.c
> index fd20423d3ed24c..6d6cd24c7c2536 100644
> --- a/fs/udf/namei.c
> +++ b/fs/udf/namei.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * namei.c
> *
> @@ -5,11 +6,6 @@
> * Inode name handling routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1998-2004 Ben Fennema
> * (C) 1999-2000 Stelias Computing Inc
> *
> diff --git a/fs/udf/osta_udf.h b/fs/udf/osta_udf.h
> index 157de0ec0cd530..85a5924873aeb5 100644
> --- a/fs/udf/osta_udf.h
> +++ b/fs/udf/osta_udf.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: BSD-2-Clause OR GPL-1.0-only */
> /*
> * osta_udf.h
> *
> @@ -8,29 +9,6 @@
> * Copyright (c) 2017-2019 Pali Roh?r <[email protected]>
> * All rights reserved.
> *
> - * Redistribution and use in source and binary forms, with or without
> - * modification, are permitted provided that the following conditions
> - * are met:
> - * 1. Redistributions of source code must retain the above copyright
> - * notice, this list of conditions, and the following disclaimer,
> - * without modification.
> - * 2. The name of the author may not be used to endorse or promote products
> - * derived from this software without specific prior written permission.
> - *
> - * Alternatively, this software may be distributed under the terms of the
> - * GNU Public License ("GPL").
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
> - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
> - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> - * SUCH DAMAGE.
> */
>
> /**
> diff --git a/fs/udf/partition.c b/fs/udf/partition.c
> index 5bcfe78d5cabe9..7d78be28929906 100644
> --- a/fs/udf/partition.c
> +++ b/fs/udf/partition.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * partition.c
> *
> @@ -5,11 +6,6 @@
> * Partition handling routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1998-2001 Ben Fennema
> *
> * HISTORY
> diff --git a/fs/udf/super.c b/fs/udf/super.c
> index 6304e3c5c3d969..80bee18ec6e1f4 100644
> --- a/fs/udf/super.c
> +++ b/fs/udf/super.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * super.c
> *
> @@ -15,11 +16,6 @@
> * https://www.iso.org/
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1998 Dave Boynton
> * (C) 1998-2004 Ben Fennema
> * (C) 2000 Stelias Computing Inc
> diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
> index a34c8c4e6d2109..0b91b2c92bddb8 100644
> --- a/fs/udf/symlink.c
> +++ b/fs/udf/symlink.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * symlink.c
> *
> @@ -5,11 +6,6 @@
> * Symlink handling routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1998-2001 Ben Fennema
> * (C) 1999 Stelias Computing Inc
> *
> diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
> index 2e7ba234bab8b8..3fb6c2abb4dc34 100644
> --- a/fs/udf/truncate.c
> +++ b/fs/udf/truncate.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * truncate.c
> *
> @@ -5,11 +6,6 @@
> * Truncate handling routines for the OSTA-UDF(tm) filesystem.
> *
> * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> - *
> * (C) 1999-2004 Ben Fennema
> * (C) 1999 Stelias Computing Inc
> *
> diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
> index fce4ad976c8c29..d525ea68725f1c 100644
> --- a/fs/udf/udftime.c
> +++ b/fs/udf/udftime.c
> @@ -1,21 +1,4 @@
> -/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Paul Eggert ([email protected]).
> -
> - The GNU C Library is free software; you can redistribute it and/or
> - modify it under the terms of the GNU Library General Public License as
> - published by the Free Software Foundation; either version 2 of the
> - License, or (at your option) any later version.
> -
> - The GNU C Library is distributed in the hope that it will be useful,
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - Library General Public License for more details.
> -
> - You should have received a copy of the GNU Library General Public
> - License along with the GNU C Library; see the file COPYING.LIB. If not,
> - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> - Boston, MA 02111-1307, USA. */
> +/* SPDX-License-Identifier: GPL-2.0-only */
>
> /*
> * dgb 10/02/98: ripped this from glibc source to help convert timestamps
> diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
> index 622569007b530b..5d6b66e15fcded 100644
> --- a/fs/udf/unicode.c
> +++ b/fs/udf/unicode.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * unicode.c
> *
> @@ -11,11 +12,6 @@
> * UTF-8 is explained in the IETF RFC XXXX.
> * ftp://ftp.internic.net/rfc/rfcxxxx.txt
> *
> - * COPYRIGHT
> - * This file is distributed under the terms of the GNU General Public
> - * License (GPL). Copies of the GPL can be obtained from:
> - * ftp://prep.ai.mit.edu/pub/gnu/GPL
> - * Each contributing author retains all rights to their own work.
> */
>
> #include "udfdecl.h"
> --
> An old man doll... just what I always wanted! - Clara
>
--
Jan Kara <[email protected]>
SUSE Labs, CR