On Tue, May 21, 2019 at 3:45 AM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > > 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 Here, it looks like some initial company inserted additional warranty disclaimers (title and noninfringement) into the default GNU license notice language, and this then got replicated by others. This is a little different from the BSD/IBM-PL cases of importing more or less wholesale the disclaimer provisions of other licenses. But the likely motivation was the same (I used to recommend things like this myself) and I think a case could be made for treating these similarly (that is, as something other than merely representable by "GPL-2.0-or-later"). Richard > 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). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch3&id=746c8e228af4 > --- > 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(-) > > --- a/arch/ia64/kernel/err_inject.c > +++ b/arch/ia64/kernel/err_inject.c > @@ -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 <fenghua.yu@xxxxxxxxx>, Intel Corporation > * Copyright (C) 2006, Intel Corp. All rights reserved. > - * > */ > #include <linux/device.h> > #include <linux/init.h> > --- a/arch/powerpc/kernel/eeh_driver.c > +++ b/arch/powerpc/kernel/eeh_driver.c > @@ -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 <linas@xxxxxxxxxxxxxx> > */ > #include <linux/delay.h> > --- a/arch/powerpc/kernel/eeh_sysfs.c > +++ b/arch/powerpc/kernel/eeh_sysfs.c > @@ -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 <linas@xxxxxxxxxxxxxx> > */ > #include <linux/pci.h> > --- a/arch/powerpc/platforms/pseries/pci_dlpar.c > +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c > @@ -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 <linas@xxxxxxxxxxxxxx> > * > * 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> > --- a/arch/x86/include/asm/topology.h > +++ b/arch/x86/include/asm/topology.h > @@ -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 <colpatch@xxxxxxxxxx> > */ > #ifndef _ASM_X86_TOPOLOGY_H > --- a/arch/x86/kernel/topology.c > +++ b/arch/x86/kernel/topology.c > @@ -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 <colpatch@xxxxxxxxxx> > */ > #include <linux/nodemask.h> > --- a/arch/x86/mm/numa_32.c > +++ b/arch/x86/mm/numa_32.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Written by: Patricia Gaughen <gone@xxxxxxxxxx>, 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> > --- a/drivers/char/tlclk.c > +++ b/drivers/char/tlclk.c > @@ -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 <sebastien.bouchard@xxxxxxxxxxxxxx> and the current > * Maintainer <mark.gross@xxxxxxxxx> > * > --- a/fs/ocfs2/symlink.c > +++ b/fs/ocfs2/symlink.c > @@ -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 ssic-linux-devel@xxxxxxxxxxxxxxxxxxxxx > * > * Copyright (C) 1992 Rick Sladkey > @@ -31,7 +17,6 @@ > * ocfs2 symlink handling code. > * > * Copyright (C) 2004, 2005 Oracle. > - * > */ > > #include <linux/fs.h> > --- a/include/asm-generic/topology.h > +++ b/include/asm-generic/topology.h > @@ -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 <colpatch@xxxxxxxxxx> > */ > #ifndef _ASM_GENERIC_TOPOLOGY_H > --- a/include/linux/topology.h > +++ b/include/linux/topology.h > @@ -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 <colpatch@xxxxxxxxxx> > */ > #ifndef _LINUX_TOPOLOGY_H > --- a/kernel/configs.c > +++ b/kernel/configs.c > @@ -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 <rdunlap@xxxxxxxxxxxx> > * Copyright (C) 2002 Al Stone <ahs3@xxxxxxxxx> > * 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> > > -- Richard Fontana Senior Commercial Counsel Red Hat, Inc.
