| Message ID | 20220819110430.433984-1-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | powerpc/boot: Convert more files to use SPDX tags | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 23 jobs. |
On Fri, Aug 19, 2022 at 09:04:30PM +1000, Michael Ellerman wrote: > These files are all plain GPL 2.0, with a second sentence about being > licensed as-is. > > Similar to the rule in commit 577b61cee5b2 ("treewide: Replace GPLv2 > boilerplate/reference with SPDX - gpl-2.0_398.RULE"). > > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> > --- > arch/powerpc/boot/44x.h | 5 +---- > arch/powerpc/boot/4xx.h | 5 +---- > arch/powerpc/boot/ops.h | 6 ++---- > arch/powerpc/boot/serial.c | 6 ++---- > arch/powerpc/boot/simple_alloc.c | 6 ++---- > 5 files changed, 8 insertions(+), 20 deletions(-) Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Do you want this to go through the SPDX tree, or will you route it through the normal ppc tree? Either is fine with me, just let me know if you want me to take it in the SPDX tree. thanks, greg k-h
Greg KH <gregkh@linuxfoundation.org> writes: > On Fri, Aug 19, 2022 at 09:04:30PM +1000, Michael Ellerman wrote: >> These files are all plain GPL 2.0, with a second sentence about being >> licensed as-is. >> >> Similar to the rule in commit 577b61cee5b2 ("treewide: Replace GPLv2 >> boilerplate/reference with SPDX - gpl-2.0_398.RULE"). >> >> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> >> --- >> arch/powerpc/boot/44x.h | 5 +---- >> arch/powerpc/boot/4xx.h | 5 +---- >> arch/powerpc/boot/ops.h | 6 ++---- >> arch/powerpc/boot/serial.c | 6 ++---- >> arch/powerpc/boot/simple_alloc.c | 6 ++---- >> 5 files changed, 8 insertions(+), 20 deletions(-) > > > Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Thanks. > Do you want this to go through the SPDX tree, or will you route it > through the normal ppc tree? Either is fine with me, just let me know > if you want me to take it in the SPDX tree. I'll take it via powerpc, less likely to generate conflicts that way. cheers
On Fri, 19 Aug 2022 21:04:30 +1000, Michael Ellerman wrote: > These files are all plain GPL 2.0, with a second sentence about being > licensed as-is. > > Similar to the rule in commit 577b61cee5b2 ("treewide: Replace GPLv2 > boilerplate/reference with SPDX - gpl-2.0_398.RULE"). > > > [...] Applied to powerpc/next. [1/1] powerpc/boot: Convert more files to use SPDX tags https://git.kernel.org/powerpc/c/e01432baf6618296f4d2d557e6b4c3245a5cc3c2 cheers
diff --git a/arch/powerpc/boot/44x.h b/arch/powerpc/boot/44x.h index 02563443788a..9b15e59522d6 100644 --- a/arch/powerpc/boot/44x.h +++ b/arch/powerpc/boot/44x.h @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * PowerPC 44x related functions * * Copyright 2007 David Gibson, IBM Corporation. - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #ifndef _PPC_BOOT_44X_H_ #define _PPC_BOOT_44X_H_ diff --git a/arch/powerpc/boot/4xx.h b/arch/powerpc/boot/4xx.h index 7dc5d45361bc..77f15d124c81 100644 --- a/arch/powerpc/boot/4xx.h +++ b/arch/powerpc/boot/4xx.h @@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * PowerPC 4xx related functions * * Copyright 2007 IBM Corporation. * Josh Boyer <jwboyer@linux.vnet.ibm.com> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #ifndef _POWERPC_BOOT_4XX_H_ #define _POWERPC_BOOT_4XX_H_ diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h index 8334bc3cbe49..a40c2162a4e9 100644 --- a/arch/powerpc/boot/ops.h +++ b/arch/powerpc/boot/ops.h @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Global definition of all the bootwrapper operations. * * Author: Mark A. Greer <mgreer@mvista.com> * - * 2006 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2006 (c) MontaVista Software, Inc. */ #ifndef _PPC_BOOT_OPS_H_ #define _PPC_BOOT_OPS_H_ diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c index 54d2522be485..57b23ff53fde 100644 --- a/arch/powerpc/boot/serial.c +++ b/arch/powerpc/boot/serial.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Generic serial console support * @@ -6,10 +7,7 @@ * Code in serial_edit_cmdline() copied from <file:arch/ppc/boot/simple/misc.c> * and was written by Matt Porter <mporter@kernel.crashing.org>. * - * 2001,2006 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2001,2006 (c) MontaVista Software, Inc. */ #include <stdarg.h> #include <stddef.h> diff --git a/arch/powerpc/boot/simple_alloc.c b/arch/powerpc/boot/simple_alloc.c index 65ec135d0157..eccbf3b6cc00 100644 --- a/arch/powerpc/boot/simple_alloc.c +++ b/arch/powerpc/boot/simple_alloc.c @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Implement primitive realloc(3) functionality. * * Author: Mark A. Greer <mgreer@mvista.com> * - * 2006 (c) MontaVista, Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2006 (c) MontaVista, Software, Inc. */ #include <stddef.h>
These files are all plain GPL 2.0, with a second sentence about being licensed as-is. Similar to the rule in commit 577b61cee5b2 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_398.RULE"). Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/boot/44x.h | 5 +---- arch/powerpc/boot/4xx.h | 5 +---- arch/powerpc/boot/ops.h | 6 ++---- arch/powerpc/boot/serial.c | 6 ++---- arch/powerpc/boot/simple_alloc.c | 6 ++---- 5 files changed, 8 insertions(+), 20 deletions(-)