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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CC7CC7EE23 for ; Tue, 23 May 2023 17:58:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9CBF2900003; Tue, 23 May 2023 13:58:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97CB6900002; Tue, 23 May 2023 13:58:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81E28900003; Tue, 23 May 2023 13:58:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 713CA900002 for ; Tue, 23 May 2023 13:58:08 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 42CF840709 for ; Tue, 23 May 2023 17:58:08 +0000 (UTC) X-FDA: 80822278656.09.D4ED7FF Received: from mx1.supremebox.com (mx1-b1.supremebox.com [208.117.46.203]) by imf24.hostedemail.com (Postfix) with ESMTP id 64A11180018 for ; Tue, 23 May 2023 17:58:05 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none ("invalid DKIM record") header.d=jilayne.com header.s=default header.b=Cag4RyGI; spf=pass (imf24.hostedemail.com: domain of opensource@jilayne.com designates 208.117.46.203 as permitted sender) smtp.mailfrom=opensource@jilayne.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684864686; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1VCjhlcEPRFNU+DHDuOHGByY0PXJkMk5tbaR2DmYx88=; b=tLBP3ylnttwZEf3gBWMIvuw7LCSe7alEZoOQzFumoQ3p+cJGP0+tHWF5K9ak7hKn1K/8Mx phRKJjZt/jmmPkal7ey1qnWfJZin+sp58RGZZYWqyfCkBKcuygwtyWzkoR39KWajtMMFr7 nFR0Z4LUnrYmxnwgCUJH/JmO+yL/6ZQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684864686; a=rsa-sha256; cv=none; b=rrm+25kp44IG36u53NVDxna7iZbJKF/+nAJbNS6ZjRorXuj/0RM0fkbgy0S1vcsXIecgAe qbs9hqg5UsockboRqV8TtAdDkEJDTQIXBF3HLXL1in+bMasT+SXqg4xoLW/KUs1Lpc8B8B 39pwqxUnKavAtchEJVHJMGMpBTxqKds= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none ("invalid DKIM record") header.d=jilayne.com header.s=default header.b=Cag4RyGI; spf=pass (imf24.hostedemail.com: domain of opensource@jilayne.com designates 208.117.46.203 as permitted sender) smtp.mailfrom=opensource@jilayne.com; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=jilayne.com ; s=default; h=In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Content-Type:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=1VCjhlcEPRFNU+DHDuOHGByY0PXJkMk5tbaR2DmYx88=; b=Cag4RyGI+Nr7nvH/Iq3TfzaxNl C3zgWeuiLxoA5yxAXBarx/4sGmwAYmAID/sDG9JIcaRn4zhJ/CoGbsM9NHXIbXm6OQ8OGHlYorIl9 C6VPBXgpkPbtLPfpP/uD10y1QPRDJAqleRITRdcjrR6AH55UKGRTHM0EBlYFJt/VX7yc=; Received: from 75-166-155-104.hlrn.qwest.net ([75.166.155.104] helo=[192.168.1.227]) by mx1.supremebox.com with esmtpa (Exim 4.92) (envelope-from ) id 1q1WGp-0002wG-61; Tue, 23 May 2023 17:58:03 +0000 Content-Type: multipart/alternative; boundary="------------l0Xk6tQ2lM1dZy9xLW30F2qM" Message-ID: <05210fe3-8392-08ac-2cc0-cf7fd9b6a05d@jilayne.com> Date: Tue, 23 May 2023 11:58:01 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v2 1/2] fs: udf: Replace GPL 2.0 boilerplate license notice with SPDX identifier Content-Language: en-US To: Bagas Sanjaya , Linux SPDX Licenses , Linux Kernel Mailing List , Linux ARM , Linux Kernel Actions , Linux Memory Management List Cc: Jan Kara , =?UTF-8?Q?Andreas_F=c3=a4rber?= , Manivannan Sadhasivam , Christoph Hellwig , Andrew Morton , Diederik de Haas , Kate Stewart , Philippe Ombredanne , Greg Kroah-Hartman , Thomas Gleixner , =?UTF-8?Q?Pali_Roh=c3=a1r?= References: <20230522005434.22133-1-bagasdotme@gmail.com> <20230522005434.22133-2-bagasdotme@gmail.com> From: J Lovejoy In-Reply-To: <20230522005434.22133-2-bagasdotme@gmail.com> X-Sender-Ident-agJab5osgicCis: opensource@jilayne.com X-Stat-Signature: ffonn7qnb8ghwsxtanpm4d8c7sxciwua X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 64A11180018 X-Rspam-User: X-HE-Tag: 1684864685-984720 X-HE-Meta: U2FsdGVkX18ErOZkg8izWQ17+N4cKuxvS1NlaUT9JWYKtwvfatf88D4A1aqL6ImsCI3qhJce4PoCxj7kQUwFT9wl6QZeeX+zGDuggWIEVj2LBOUcj0uayXdlJrlabLkevIxWdPlOCKaA+GbwSuzbepzPq8AEIJuaANeb6KVp8PXLB82u81s6Z+JwjcxQ0tDq8FbUpu2aoFW+GDNlABUohAbHBfAWyPcnuz5jAEwVjJPzucDzgoFn+YrrXyXwPKKN/XvSoG00tQv2nsTyq0NzA/o8rGZr8U+8+wnUa4pXyIF4ESRyHg+ZsTdHZ0t5XEQQBQp1lfVROlDGzPgE9EPjGnVCLWWfdGJscQN2bDeOtoG/MUsHE2h4oU0ofxREkBYG7HmdotvDTPlhW90kTCc8QMIhE9RVOMfdEIvVMFRAZY+QAXrHWai7+Aqktk+/b7o43rf2HOgZ4Gu9KjUtGWcx+4/792DjmQg3N2DaeobGHkDwhtkcEkr6/a7HhO45wbw6/bRjQUeNkAIAPqdSLTrO2aMqYmcbKuDHhfgD3HKTERlF6HA0gh9TPEdFvsewqVRaPAmHfw9++OyNaXLK42OcUuwe1pp/dHUlcPQpGkU3ipHT9nj7rN9Xxrd98HbWrHNHNOcnIzJ0euvcHWoYURNtnU3MpyW7GL7Jl6KRqNWYh9wlYLa5S/Z8/w9uDCGX+jSjBZa1vYV7C+XqNLfLM8LYXfGlzkxmX7CoudrO7BDlVwoa2njuABKcr5W1Y2UoYFbvyPt0Al4pylFgQXx/pEE1tLtB8d5V9NUYDzPTqa9gb5YX0bB33OoGGxe1TIBv4oCsVcAngElMCrwbeoLZ1pO+rPUR41FhLJbFf9hVL9HlaSmW03uNVIEiAgC5HRIwfpK3y0Q4jAgAqaJuvMfjk6pLbrQT8wi93yDNxy/zTUq/mqWLqi/WCbMkawcLbgYAbmqTMZiyt9XquWb5ao+zKUN GeKneFfS E8544IrI/rSH8gKHmt+WooOdofi0omdw0RYs0mrzQ/5rP4+tHpK5zGw4D0qD+1haM3cmt+YolonEG+S0Fb4gIwKjLrEUUUx63eGNHT8JqurdaALd7Vuw5qxSz9ijIU8bZDyCHxZVlF1uQHXFQtMYN1wHp13FDsuKdAUfe3aV9/OMK9TSvaMFMLEkBzB358IlsEKWGkJr7/lPi+HLveFW8lqMBo9VLhndep2445JFRtqq6+QWu70YISJksGiEHQMx2SIy5ucQIvI2YwLng/3UoI0Abq6VYw3uvioGhgvrJDRnVi2ZLej5PTE8R3+NnrNOP0e0H0wh54GMvdGo858tZVIwdIpCuvLg66j40/xe1KoNMdM5vbEDOiE4YQgNqgyckkzGGYC3TvE6FYxvBFjbx0MHeZ17GnopkIqIqX5lsaNkxp5Uxlekxg9yPqBWDko9VnRn9RW8nqbiRA24ocoB9cPhHcoTDwWbn4SMCn3pWcuySeLH6df/La93IslYlbauWO7uIJl6o58vdZU104/JtLMG2cczw+HKmTZ2wYw+RQxvmDxEV5s8eLyPnS12d7d3Ss8t2KH7owyYKiK4UssggMddWPYEFuPNB7nMkY8ZlS4dpo1yBeYcG10zG1sac+EJDI0gw X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This is a multi-part message in MIME format. --------------l0Xk6tQ2lM1dZy9xLW30F2qM Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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 :) Jilayne 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 > Cc: Pali Rohár > Link:https://web.archive.org/web/20020809115410/ftp://prep.ai.mit.edu/pub/gnu/GPL [1] > Signed-off-by: Bagas Sanjaya > --- > 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 > 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" --------------l0Xk6tQ2lM1dZy9xLW30F2qM Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 :)

Jilayne

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
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"

--------------l0Xk6tQ2lM1dZy9xLW30F2qM--