Skip to contentSkip to conversation

Deep review of the 'good title' disclaimer variant

PATCH In review Thomas Gleixner 3 participants 11 messages Jun 5, 2019 – Jun 10, 2019

Subsystems (18)
Network drivers x86 SCSI PowerPC +14 more subsystems
lore
Share & tools
lore
#0 lore raw

cover Deep review of the 'good title' disclaimer variant

The following modified disclaimer is beyond my competence so I refrain from commenting on it and leave it to our lawyer friends to make sense of it.

Standard disclaimer:

this program 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 general public license for more details

Modified disclaimer:

this program 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 good title or non infringement see the gnu general public license for more details

The extra bit is: "good title or non infringement"

Note, all patches have the first part of the standard GPLv2 notice (some v2 only, some v2 or later).

Enjoy!

tglx

#1 lore raw

PATCH 1/8 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 66

From: Thomas Gleixner [email protected]

Based on 1 normalized pattern(s):

this program 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 program 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 good title or non infringement see the gnu general public license for more details you should have received a copy of the gnu general public license along with this program if not write to the free software foundation inc 675 mass ave cambridge ma 02139 usa

extracted by the scancode license scanner the SPDX license identifier

GPL-2.0-or-later

has been chosen to replace the boilerplate/reference in 12 file(s).

Bucket: GOODTITLE

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=goodtitle&id=583de3a5844d

---
 arch/ia64/kernel/err_inject.c              |   17 +----------------
 arch/powerpc/kernel/eeh_driver.c           |   16 +---------------
 arch/powerpc/kernel/eeh_sysfs.c            |   16 +---------------
 arch/powerpc/platforms/pseries/pci_dlpar.c |   16 +---------------
 arch/x86/include/asm/topology.h            |   16 +---------------
 arch/x86/kernel/topology.c                 |   16 +---------------
 arch/x86/mm/numa_32.c                      |   16 +---------------
 drivers/char/tlclk.c                       |   16 +---------------
 fs/ocfs2/symlink.c                         |   17 +----------------
 include/asm-generic/topology.h             |   16 +---------------
 include/linux/topology.h                   |   16 +---------------
 kernel/configs.c                           |   16 +---------------
 12 files changed, 12 insertions(+), 182 deletions(-)
arch/ia64/kernel/err_inject.c +1 -16
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * err_inject.c -
  *	1.) Inject errors to a processor.
@@ -5,24 +6,8 @@
  * This driver along with user space code can be acting as an error
  * injection tool.
  *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Written by: Fenghua Yu <[email protected]>, Intel Corporation
  * Copyright (C) 2006, Intel Corp.  All rights reserved.
- *
  */
 #include <linux/device.h>
 #include <linux/init.h>
arch/powerpc/kernel/eeh_driver.c +1 -15
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * PCI Error Recovery Driver for RPA-compliant PPC64 platform.
  * Copyright IBM Corp. 2004 2005
@@ -5,21 +6,6 @@
  *
  * All rights reserved.
  *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Send comments and feedback to Linas Vepstas <[email protected]>
  */
 #include <linux/delay.h>
arch/powerpc/kernel/eeh_sysfs.c +1 -15
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Sysfs entries for PCI Error Recovery for PAPR-compliant platform.
  * Copyright IBM Corporation 2007
@@ -5,21 +6,6 @@
  *
  * All rights reserved.
  *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Send comments and feedback to Linas Vepstas <[email protected]>
  */
 #include <linux/pci.h>
arch/powerpc/platforms/pseries/pci_dlpar.c +1 -15
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * PCI Dynamic LPAR, PCI Hot Plug and PCI EEH recovery code
  * for RPA-compliant PPC64 platform.
@@ -8,21 +9,6 @@
  * Updates, 2005, Linas Vepstas <[email protected]>
  *
  * All rights reserved.
- *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/pci.h>
arch/x86/include/asm/topology.h +1 -15
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Written by: Matthew Dobson, IBM Corporation
  *
@@ -5,21 +6,6 @@
  *
  * All rights reserved.
  *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Send feedback to <[email protected]>
  */
 #ifndef _ASM_X86_TOPOLOGY_H
arch/x86/kernel/topology.c +1 -15
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Populate sysfs with topology information
  *
@@ -8,21 +9,6 @@
  *
  * All rights reserved.
  *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Send feedback to <[email protected]>
  */
 #include <linux/nodemask.h>
arch/x86/mm/numa_32.c +1 -15
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Written by: Patricia Gaughen <[email protected]>, IBM Corporation
  * August 2002: added remote node KVA remap - Martin J. Bligh 
@@ -5,21 +6,6 @@
  * Copyright (C) 2002, IBM Corp.
  *
  * All rights reserved.          
- *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/memblock.h>
drivers/char/tlclk.c +1 -15
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Telecom Clock driver for Intel NetStructure(tm) MPCBL0010
  *
@@ -5,21 +6,6 @@
  *
  * All rights reserved.
  *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Send feedback to <[email protected]> and the current
  * Maintainer  <[email protected]>
  *
fs/ocfs2/symlink.c +1 -16
@@ -1,23 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* -*- mode: c; c-basic-offset: 8; -*-
  * vim: noexpandtab sw=8 ts=8 sts=0:
  *
  *  linux/cluster/ssi/cfs/symlink.c
  *
- *	This program 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 program 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, GOOD TITLE
- *	or NON INFRINGEMENT.  See the GNU General Public License for more
- *	details.
- *
- * 	You should have received a copy of the GNU General Public License
- * 	along with this program; if not, write to the Free Software
- * 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  *	Questions/Comments/Bugfixes to [email protected]
  *
  *  Copyright (C) 1992  Rick Sladkey
@@ -31,7 +17,6 @@
  *  ocfs2 symlink handling code.
  *
  *  Copyright (C) 2004, 2005 Oracle.
- *
  */
 
 #include <linux/fs.h>
include/asm-generic/topology.h +1 -15
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * linux/include/asm-generic/topology.h
  *
@@ -7,21 +8,6 @@
  *
  * All rights reserved.
  *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Send feedback to <[email protected]>
  */
 #ifndef _ASM_GENERIC_TOPOLOGY_H
include/linux/topology.h +1 -15
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * include/linux/topology.h
  *
@@ -7,21 +8,6 @@
  *
  * All rights reserved.
  *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * Send feedback to <[email protected]>
  */
 #ifndef _LINUX_TOPOLOGY_H
kernel/configs.c +1 -15
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * kernel/configs.c
  * Echo the kernel .config file used to build the kernel
@@ -6,21 +7,6 @@
  * Copyright (C) 2002 Randy Dunlap <[email protected]>
  * Copyright (C) 2002 Al Stone <[email protected]>
  * Copyright (C) 2002 Hewlett-Packard Company
- *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
#2 lore raw

PATCH 2/8 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 107

In reply to Thomas Gleixner

From: Thomas Gleixner [email protected]

Based on 1 normalized pattern(s):

this program 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 program 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 good title or non infringement see the gnu general public license for more details you should have received a copy of the gnu general public license along with this program if not write to the free software foundation inc 51 franklin st fifth floor boston ma 02110 1301 usa

extracted by the scancode license scanner the SPDX license identifier

GPL-2.0-or-later

has been chosen to replace the boilerplate/reference in 5 file(s).

Bucket: GOODTITLE

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=goodtitle&id=6d8a10036723

---
 arch/x86/include/asm/hypervisor.h |   17 +----------------
 arch/x86/kernel/cpu/hypervisor.c  |   17 +----------------
 arch/x86/kernel/cpu/vmware.c      |   17 +----------------
 drivers/macintosh/via-pmu-event.c |   17 +----------------
 drivers/macintosh/via-pmu-led.c   |   17 +----------------
 5 files changed, 5 insertions(+), 80 deletions(-)
arch/x86/include/asm/hypervisor.h +1 -16
@@ -1,21 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2008, VMware, Inc.
- *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 #ifndef _ASM_X86_HYPERVISOR_H
 #define _ASM_X86_HYPERVISOR_H
arch/x86/kernel/cpu/hypervisor.c +1 -16
@@ -1,24 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Common hypervisor code
  *
  * Copyright (C) 2008, VMware, Inc.
  * Author : Alok N Kataria <[email protected]>
- *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 #include <linux/init.h>
arch/x86/kernel/cpu/vmware.c +1 -16
@@ -1,24 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * VMware Detection code.
  *
  * Copyright (C) 2008, VMware, Inc.
  * Author : Alok N Kataria <[email protected]>
- *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 #include <linux/dmi.h>
drivers/macintosh/via-pmu-event.c +1 -16
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * via-pmu event device for reporting some events that come through the PMU
  *
  * Copyright 2006 Johannes Berg <[email protected]>
- *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
  */
 
 #include <linux/input.h>
drivers/macintosh/via-pmu-led.c +1 -16
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * via-pmu LED class device
  *
  * Copyright 2006 Johannes Berg <[email protected]>
- *
- * This program 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 program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
  */
 #include <linux/types.h>
 #include <linux/kernel.h>
#3 lore raw

PATCH 3/8 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 169

In reply to Thomas Gleixner

From: Thomas Gleixner [email protected]

Based on 1 normalized pattern(s):

this program 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 version 2 of the license this program 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 good title or non infringement see the gnu general public license for more details you should have received a copy of the gnu general public license along with this program if not write to the free software foundation inc 675 mass ave cambridge ma 02139 usa

extracted by the scancode license scanner the SPDX license identifier

GPL-2.0-only

has been chosen to replace the boilerplate/reference in 1 file(s).

Bucket: GOODTITLE

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=goodtitle&id=1f6c91a119c4

---
 drivers/cpufreq/pcc-cpufreq.c |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)
drivers/cpufreq/pcc-cpufreq.c +1 -13
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  pcc-cpufreq.c - Processor Clocking Control firmware cpufreq interface
  *
@@ -7,19 +8,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
- *  This program 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; version 2 of the License.
- *
- *  This program 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, GOOD TITLE or NON
- *  INFRINGEMENT. See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
#4 lore raw

PATCH 4/8 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 293

In reply to Thomas Gleixner

From: Thomas Gleixner [email protected]

Based on 1 normalized pattern(s):

this program 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 version 2 this program 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 good title or non infringement see the gnu general public license for more details

extracted by the scancode license scanner the SPDX license identifier

GPL-2.0-only

has been chosen to replace the boilerplate/reference in 1 file(s).

Bucket: GOODTITLE

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=goodtitle&id=3339bb962ccc

---
 arch/c6x/include/asm/syscalls.h |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
arch/c6x/include/asm/syscalls.h +1 -10
@@ -1,16 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2011 Texas Instruments Incorporated
  * Author: Mark Salter <[email protected]>
- *
- * This program 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, version 2.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for
- * more details.
  */
 
 #ifndef __ASM_C6X_SYSCALLS_H
#5 lore raw

PATCH 5/8 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 337

In reply to Thomas Gleixner

From: Thomas Gleixner [email protected]

Based on 1 normalized pattern(s):

this program 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 version 2 of the license and no later version this program 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 good title or non infringement see the gnu general public license for more details you should have received a copy of the gnu general public license along with this program if not write to the free software foundation inc 51 franklin st fifth floor boston ma 02110 1301 usa the full gnu general public license is included in this distribution in the file called copying

extracted by the scancode license scanner the SPDX license identifier

GPL-2.0-only

has been chosen to replace the boilerplate/reference in 6 file(s).

Bucket: GOODTITLE

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=goodtitle&id=15ac50164880

---
 drivers/net/vmxnet3/Makefile          |   18 +-----------------
 drivers/net/vmxnet3/upt1_defs.h       |   19 +------------------
 drivers/net/vmxnet3/vmxnet3_defs.h    |   19 +------------------
 drivers/net/vmxnet3/vmxnet3_drv.c     |   19 +------------------
 drivers/net/vmxnet3/vmxnet3_ethtool.c |   19 +------------------
 drivers/net/vmxnet3/vmxnet3_int.h     |   19 +------------------
 6 files changed, 6 insertions(+), 107 deletions(-)
drivers/net/vmxnet3/Makefile +1 -17
@@ -1,26 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
 ################################################################################
 #
 # Linux driver for VMware's vmxnet3 ethernet NIC.
 #
 # Copyright (C) 2007-2016, VMware, Inc. All Rights Reserved.
 #
-# This program 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; version 2 of the License and no later version.
-#
-# This program 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, GOOD TITLE or
-# NON INFRINGEMENT.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# The full GNU General Public License is included in this distribution in
-# the file called "COPYING".
-#
 # Maintained by: [email protected]
 #
 #
drivers/net/vmxnet3/upt1_defs.h +1 -18
@@ -1,27 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Linux driver for VMware's vmxnet3 ethernet NIC.
  *
  * Copyright (C) 2008-2016, VMware, Inc. All Rights Reserved.
  *
- * This program 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; version 2 of the License and no later version.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
  * Maintained by: [email protected]
- *
  */
 
 #ifndef _UPT1_DEFS_H
drivers/net/vmxnet3/vmxnet3_defs.h +1 -18
@@ -1,27 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Linux driver for VMware's vmxnet3 ethernet NIC.
  *
  * Copyright (C) 2008-2016, VMware, Inc. All Rights Reserved.
  *
- * This program 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; version 2 of the License and no later version.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
  * Maintained by: [email protected]
- *
  */
 
 #ifndef _VMXNET3_DEFS_H_
drivers/net/vmxnet3/vmxnet3_drv.c +1 -18
@@ -1,27 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Linux driver for VMware's vmxnet3 ethernet NIC.
  *
  * Copyright (C) 2008-2016, VMware, Inc. All Rights Reserved.
  *
- * This program 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; version 2 of the License and no later version.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
  * Maintained by: [email protected]
- *
  */
 
 #include <linux/module.h>
drivers/net/vmxnet3/vmxnet3_ethtool.c +1 -18
@@ -1,27 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Linux driver for VMware's vmxnet3 ethernet NIC.
  *
  * Copyright (C) 2008-2016, VMware, Inc. All Rights Reserved.
  *
- * This program 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; version 2 of the License and no later version.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
  * Maintained by: [email protected]
- *
  */
 
 
drivers/net/vmxnet3/vmxnet3_int.h +1 -18
@@ -1,27 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Linux driver for VMware's vmxnet3 ethernet NIC.
  *
  * Copyright (C) 2008-2016, VMware, Inc. All Rights Reserved.
  *
- * This program 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; version 2 of the License and no later version.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
  * Maintained by: [email protected]
- *
  */
 
 #ifndef _VMXNET3_INT_H
#6 lore raw

PATCH 6/8 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 415

In reply to Thomas Gleixner

From: Thomas Gleixner [email protected]

Based on 1 normalized pattern(s):

this program is free software you can redistribute it and or modify it under the terms of the gnu general public license version 2 as published by the free software foundation this program 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 good title or non infringement see the gnu general public license for more details you should have received a copy of the gnu general public license along with this program if not write to the free software foundation inc 51 franklin st fifth floor boston ma 02110 1301 usa

extracted by the scancode license scanner the SPDX license identifier

GPL-2.0-only

has been chosen to replace the boilerplate/reference in 2 file(s).

Bucket: GOODTITLE

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=goodtitle&id=f361dd5c8e2e

---
 drivers/hv/hv_kvp.c      |   17 +----------------
 tools/hv/hv_kvp_daemon.c |   17 +----------------
 2 files changed, 2 insertions(+), 32 deletions(-)
drivers/hv/hv_kvp.c +1 -16
@@ -1,24 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * An implementation of key value pair (KVP) functionality for Linux.
  *
- *
  * Copyright (C) 2010, Novell, Inc.
  * Author : K. Y. Srinivasan <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
tools/hv/hv_kvp_daemon.c +1 -16
@@ -1,24 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * An implementation of key value pair (KVP) functionality for Linux.
  *
- *
  * Copyright (C) 2010, Novell, Inc.
  * Author : K. Y. Srinivasan <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 
#7 lore raw

PATCH 7/8 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 425

In reply to Thomas Gleixner

From: Thomas Gleixner [email protected]

Based on 1 normalized pattern(s):

this program 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 version 2 of the license and no later version this program 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 good title or non infringement see the gnu general public license for more details you should have received a copy of the gnu general public license along with this program if not write to the free software foundation inc 51 franklin st fifth floor boston ma 02110 1301 usa

extracted by the scancode license scanner the SPDX license identifier

GPL-2.0-only

has been chosen to replace the boilerplate/reference in 2 file(s).

Bucket: GOODTITLE

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=goodtitle&id=1e76014351dd

---
 drivers/scsi/vmw_pvscsi.c |   16 +---------------
 drivers/scsi/vmw_pvscsi.h |   16 +---------------
 2 files changed, 2 insertions(+), 30 deletions(-)
drivers/scsi/vmw_pvscsi.c +1 -15
@@ -1,24 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Linux driver for VMware's para-virtualized SCSI HBA.
  *
  * Copyright (C) 2008-2014, VMware, Inc. All Rights Reserved.
  *
- * This program 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; version 2 of the License and no later version.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * Maintained by: Jim Gill <[email protected]>
- *
  */
 
 #include <linux/kernel.h>
drivers/scsi/vmw_pvscsi.h +1 -15
@@ -1,24 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * VMware PVSCSI header file
  *
  * Copyright (C) 2008-2014, VMware, Inc. All Rights Reserved.
  *
- * This program 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; version 2 of the License and no later version.
- *
- * This program 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, GOOD TITLE or
- * NON INFRINGEMENT.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * Maintained by: Jim Gill <[email protected]>
- *
  */
 
 #ifndef _VMW_PVSCSI_H_
#8 lore raw

PATCH 8/8 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 492

In reply to Thomas Gleixner

From: Thomas Gleixner [email protected]

Based on 1 normalized pattern(s):

this program 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 version 2 of the license this program 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 good title or non infringement see the gnu general public license for more details

extracted by the scancode license scanner the SPDX license identifier

GPL-2.0-only

has been chosen to replace the boilerplate/reference in 3 file(s).

Bucket: GOODTITLE

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=goodtitle&id=34e7c3d0e636

---
 drivers/scsi/hpsa.c     |   11 +----------
 drivers/scsi/hpsa.h     |   11 +----------
 drivers/scsi/hpsa_cmd.h |   11 +----------
 3 files changed, 3 insertions(+), 30 deletions(-)
drivers/scsi/hpsa.c +1 -10
@@ -1,20 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *    Disk Array driver for HP Smart Array SAS controllers
  *    Copyright 2016 Microsemi Corporation
  *    Copyright 2014-2015 PMC-Sierra, Inc.
  *    Copyright 2000,2009-2015 Hewlett-Packard Development Company, L.P.
  *
- *    This program 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; version 2 of the License.
- *
- *    This program 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, GOOD TITLE or
- *    NON INFRINGEMENT.  See the GNU General Public License for more details.
- *
  *    Questions/Comments/Bugfixes to [email protected]
- *
  */
 
 #include <linux/module.h>
drivers/scsi/hpsa.h +1 -10
@@ -1,20 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  *    Disk Array driver for HP Smart Array SAS controllers
  *    Copyright 2016 Microsemi Corporation
  *    Copyright 2014-2015 PMC-Sierra, Inc.
  *    Copyright 2000,2009-2015 Hewlett-Packard Development Company, L.P.
  *
- *    This program 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; version 2 of the License.
- *
- *    This program 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, GOOD TITLE or
- *    NON INFRINGEMENT.  See the GNU General Public License for more details.
- *
  *    Questions/Comments/Bugfixes to [email protected]
- *
  */
 #ifndef HPSA_H
 #define HPSA_H
drivers/scsi/hpsa_cmd.h +1 -10
@@ -1,20 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  *    Disk Array driver for HP Smart Array SAS controllers
  *    Copyright 2016 Microsemi Corporation
  *    Copyright 2014-2015 PMC-Sierra, Inc.
  *    Copyright 2000,2009-2015 Hewlett-Packard Development Company, L.P.
  *
- *    This program 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; version 2 of the License.
- *
- *    This program 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, GOOD TITLE or
- *    NON INFRINGEMENT.  See the GNU General Public License for more details.
- *
  *    Questions/Comments/Bugfixes to [email protected]
- *
  */
 #ifndef HPSA_CMD_H
 #define HPSA_CMD_H
#9 lore raw
In reply to Thomas Gleixner
Quoted 10 lines · Thomas Gleixner

The following modified disclaimer is beyond my competence so I refrain from commenting on it and leave it to our lawyer friends to make sense of it.

Standard disclaimer:

this program 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 general public license for more details

Quoted 8 lines

Modified disclaimer:

this program 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 good title or non infringement see the gnu general public license for more details

The extra bit is: "good title or non infringement"

My understanding is that the warranties of title and noninfringement are standard implied warranties, so GPLv2 already disclaims them by disclaiming any implied warranties. But, this seems more legally nuanced, so I'll wait to review until some of the lawyers comment.

Allison

#10 lore raw
Quoted 19 lines · Allison Randal
Quoted 17 lines · Thomas Gleixner

The following modified disclaimer is beyond my competence so I refrain from commenting on it and leave it to our lawyer friends to make sense of it.

Standard disclaimer:

this program 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 general public license for more details

Modified disclaimer:

this program 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 good title or non infringement see the gnu general public license for more details

Quoted 6 lines
Quoted 1 line

The extra bit is: "good title or non infringement"

My understanding is that the warranties of title and noninfringement are standard implied warranties, so GPLv2 already disclaims them by disclaiming any implied warranties. But, this seems more legally nuanced, so I'll wait to review until some of the lawyers comment.

Unfortunately it is not clear. Though this is not my view, one could argue that the warranty disclaimer provision in GPLv2 itself is inadequate to disclaim implied warranties that are not specifically mentioned, based on commercial law in the US, or at least, specifically, the implied warranties of title and noninfringement.

I would have to assume that anyone who bothered to add disclaimers of the implied warranties of title and noninfringement into the standard GNU GPL license notice (which does not mention them) did so because they believed the standard language in the notice and the license itself was -- or might be -- deficient.

I think therefore that either these disclaimer notices should be kept, unless the original copyright holder associated with the notice agrees otherwise.

Richard