Message ID | 20230522005434.22133-2-bagasdotme@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | SPDX conversion from UDF | expand |
On 5/24/23 00:58, J Lovejoy wrote: > it looks like in a couple cases you have removed the word, "COPYRIGHT" and in the other cases you have not. I could be consistent one way or another and lean towards removing it, as I see it as a heading for the old license notice, but Richard may have a different view :) > I don't have the context that you mean (I have no idea what code you're referring to). Please reply inline with appropriate context in the future.
On 5/21/23 6:54 PM, Bagas Sanjaya wrote: > The notice refers to full GPL 2.0 text on now defunct MIT FTP site [1]. > Replace it with appropriate SPDX license identifier. > > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Pali Rohár <pali@kernel.org> > Link: https://web.archive.org/web/20020809115410/ftp://prep.ai.mit.edu/pub/gnu/GPL [1] > Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> > --- > fs/udf/balloc.c | 6 +----- > fs/udf/dir.c | 6 +----- > fs/udf/directory.c | 6 +----- > 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/partition.c | 6 +----- > fs/udf/super.c | 6 +----- > fs/udf/symlink.c | 6 +----- > fs/udf/truncate.c | 6 +----- > fs/udf/unicode.c | 6 +----- > 14 files changed, 14 insertions(+), 70 deletions(-) > > diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c > index 14b9db4c80f03f..ab3ffc355949dc 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 > * > diff --git a/fs/udf/dir.c b/fs/udf/dir.c > index 212393b12c2266..f6533f93851b95 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 In these first two patches you have retained the word "COPYRIGHT" but... > diff --git a/fs/udf/directory.c b/fs/udf/directory.c > index 654536d2b60976..1c775e072b2fef 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" In this patch (as well as the last one below), you have removed the word "COPYRIGHT" - I'm not sure having that word or not makes any meaningful difference (I'd lean toward removing), but either way, I think it should be consistent > diff --git a/fs/udf/file.c b/fs/udf/file.c > index 8238f742377bab..b871b85457e5bb 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..5f7ac8c8479873 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..28cdfc57d946e3 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..9d847a7a0905dd 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..0788593b6a1d8b 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..49e1e0fe3feeb2 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/partition.c b/fs/udf/partition.c > index 5bcfe78d5cabe9..af877991edc13a 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..928a04d9d9e0ad 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..779b5c2c75f61e 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..a686c10fd709d1 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/unicode.c b/fs/udf/unicode.c > index 622569007b530b..ae6e809fa3aac7 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"
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index 14b9db4c80f03f..ab3ffc355949dc 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 * diff --git a/fs/udf/dir.c b/fs/udf/dir.c index 212393b12c2266..f6533f93851b95 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..1c775e072b2fef 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/file.c b/fs/udf/file.c index 8238f742377bab..b871b85457e5bb 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..5f7ac8c8479873 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..28cdfc57d946e3 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..9d847a7a0905dd 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..0788593b6a1d8b 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..49e1e0fe3feeb2 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/partition.c b/fs/udf/partition.c index 5bcfe78d5cabe9..af877991edc13a 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..928a04d9d9e0ad 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..779b5c2c75f61e 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..a686c10fd709d1 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/unicode.c b/fs/udf/unicode.c index 622569007b530b..ae6e809fa3aac7 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"
The notice refers to full GPL 2.0 text on now defunct MIT FTP site [1]. Replace it with appropriate SPDX license identifier. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Pali Rohár <pali@kernel.org> Link: https://web.archive.org/web/20020809115410/ftp://prep.ai.mit.edu/pub/gnu/GPL [1] Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> --- fs/udf/balloc.c | 6 +----- fs/udf/dir.c | 6 +----- fs/udf/directory.c | 6 +----- 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/partition.c | 6 +----- fs/udf/super.c | 6 +----- fs/udf/symlink.c | 6 +----- fs/udf/truncate.c | 6 +----- fs/udf/unicode.c | 6 +----- 14 files changed, 14 insertions(+), 70 deletions(-)