Reviewed-by: Allison Randal <allison@xxxxxxxxxxx> On 5/19/19 6:36 PM, J Lovejoy wrote: > Reviewed-by: Jilayne Lovejoy <opensource@xxxxxxxxxxx> > >> On May 19, 2019, at 7:51 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 >> license for more details >> >> extracted by the scancode license scanner the SPDX license identifier >> >> GPL-2.0-or-later >> >> has been chosen to replace the boilerplate/reference in 7 file(s). >> >> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> >> --- >> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=step2&id=14281789c34a >> --- >> arch/nios2/include/asm/asm-macros.h | 13 +------------ >> arch/nios2/include/asm/cache.h | 12 +----------- >> arch/nios2/include/asm/linkage.h | 12 +----------- >> drivers/acpi/acpi_memhotplug.c | 12 +----------- >> drivers/xen/xen-acpi-cpuhotplug.c | 12 +----------- >> drivers/xen/xen-acpi-memhotplug.c | 12 +----------- >> drivers/xen/xen-stub.c | 12 +----------- >> 7 files changed, 7 insertions(+), 78 deletions(-) >> >> --- a/arch/nios2/include/asm/asm-macros.h >> +++ b/arch/nios2/include/asm/asm-macros.h >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0-or-later */ >> /* >> * Macro used to simplify coding multi-line assembler. >> * Some of the bit test macro can simplify down to one line >> @@ -6,18 +7,6 @@ >> * Copyright (C) 2004 Microtronix Datacom Ltd. >> * >> * 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. >> - * >> */ >> #ifndef _ASM_NIOS2_ASMMACROS_H >> #define _ASM_NIOS2_ASMMACROS_H >> --- a/arch/nios2/include/asm/cache.h >> +++ b/arch/nios2/include/asm/cache.h >> @@ -1,18 +1,8 @@ >> +/* SPDX-License-Identifier: GPL-2.0-or-later */ >> /* >> * Copyright (C) 2004 Microtronix Datacom Ltd. >> * >> * 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. >> */ >> >> #ifndef _ASM_NIOS2_CACHE_H >> --- a/arch/nios2/include/asm/linkage.h >> +++ b/arch/nios2/include/asm/linkage.h >> @@ -1,18 +1,8 @@ >> +/* SPDX-License-Identifier: GPL-2.0-or-later */ >> /* >> * Copyright (C) 2009 Thomas Chou <thomas@xxxxxxxxxxxxx> >> * >> * 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. >> */ >> >> #ifndef _ASM_NIOS2_LINKAGE_H >> --- a/drivers/acpi/acpi_memhotplug.c >> +++ b/drivers/acpi/acpi_memhotplug.c >> @@ -1,3 +1,4 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> /* >> * Copyright (C) 2004, 2013 Intel Corporation >> * Author: Naveen B S <naveen.b.s@xxxxxxxxx> >> @@ -5,17 +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. >> - * >> * ACPI based HotPlug driver that supports Memory Hotplug >> * This driver fields notifications from firmware for memory add >> * and remove operations and alerts the VM of the affected memory >> --- a/drivers/xen/xen-acpi-cpuhotplug.c >> +++ b/drivers/xen/xen-acpi-cpuhotplug.c >> @@ -1,18 +1,8 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> /* >> * Copyright (C) 2012 Intel Corporation >> * Author: Liu Jinsong <jinsong.liu@xxxxxxxxx> >> * Author: Jiang Yunhong <yunhong.jiang@xxxxxxxxx> >> - * >> - * 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. >> */ >> >> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt >> --- a/drivers/xen/xen-acpi-memhotplug.c >> +++ b/drivers/xen/xen-acpi-memhotplug.c >> @@ -1,18 +1,8 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> /* >> * Copyright (C) 2012 Intel Corporation >> * Author: Liu Jinsong <jinsong.liu@xxxxxxxxx> >> * Author: Jiang Yunhong <yunhong.jiang@xxxxxxxxx> >> - * >> - * 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. >> */ >> >> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt >> --- a/drivers/xen/xen-stub.c >> +++ b/drivers/xen/xen-stub.c >> @@ -1,3 +1,4 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> /* >> * xen-stub.c - stub drivers to reserve space for Xen >> * >> @@ -7,17 +8,6 @@ >> * >> * Copyright (C) 2012 Oracle Inc >> * Author: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> >> - * >> - * 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. >> */ >> >> #include <linux/kernel.h> >> >> >