> -----Original Message----- > From: Luis Chamberlain <mcgrof@xxxxxxxxxxxxx> On Behalf Of Luis Chamberlain > Subject: [PATCH v11 2/2] testing: use the copyleft-next-0.3.1 SPDX tag > > Two selftests drivers exist under the copyleft-next license. > These drivers were added prior to SPDX practice taking full swing > in the kernel. Now that we have an SPDX tag for copyleft-next-0.3.1 > documented, embrace it and remove the boiler plate. > > Cc: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx> > Cc: Kuno Woudt <kuno@xxxxxxx> > Cc: Richard Fontana <fontana@xxxxxxxxxxxxxxx> > Cc: copyleft-next@xxxxxxxxxxxxxxxxxxxxxx > Cc: Ciaran Farrell <Ciaran.Farrell@xxxxxxxx> > Cc: Christopher De Nicolo <Christopher.DeNicolo@xxxxxxxx> > Cc: Christoph Hellwig <hch@xxxxxx> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: Jonathan Corbet <corbet@xxxxxxx> > Cc: Thorsten Leemhuis <linux@xxxxxxxxxxxxx> > Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> > Signed-off-by: Luis Chamberlain <mcgrof@xxxxxxxxxx> > --- > lib/test_kmod.c | 12 +----------- > lib/test_sysctl.c | 12 +----------- > tools/testing/selftests/kmod/kmod.sh | 13 +------------ > tools/testing/selftests/sysctl/sysctl.sh | 12 +----------- > 4 files changed, 4 insertions(+), 45 deletions(-) > > diff --git a/lib/test_kmod.c b/lib/test_kmod.c > index cb800b1d0d99..6423df9fa8dd 100644 > --- a/lib/test_kmod.c > +++ b/lib/test_kmod.c > @@ -1,18 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later OR copyleft-next-0.3.1 > /* > * kmod stress test driver > * > * Copyright (C) 2017 Luis R. Rodriguez <mcgrof@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; or, when distributed separately from the Linux kernel or > - * when incorporated into other software packages, subject to the following > - * license: > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of copyleft-next (version 0.3.1 or later) as published > - * at http://copyleft-next.org/. > */ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c > index 9a564971f539..e2a816d85ea2 100644 > --- a/lib/test_sysctl.c > +++ b/lib/test_sysctl.c > @@ -1,18 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later OR copyleft-next-0.3.1 > /* > * proc sysctl test driver > * > * Copyright (C) 2017 Luis R. Rodriguez <mcgrof@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; or, when distributed separately from the Linux kernel or > - * when incorporated into other software packages, subject to the following > - * license: > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of copyleft-next (version 0.3.1 or later) as published > - * at http://copyleft-next.org/. > */ > > /* > diff --git a/tools/testing/selftests/kmod/kmod.sh b/tools/testing/selftests/kmod/kmod.sh > index afd42387e8b2..7189715d7960 100755 > --- a/tools/testing/selftests/kmod/kmod.sh > +++ b/tools/testing/selftests/kmod/kmod.sh > @@ -1,18 +1,7 @@ > #!/bin/bash > -# > +# SPDX-License-Identifier: GPL-2.0-or-later OR copyleft-next-0.3.1 > # Copyright (C) 2017 Luis R. Rodriguez <mcgrof@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; or, when distributed separately from the Linux kernel or > -# when incorporated into other software packages, subject to the following > -# license: > -# > -# This program is free software; you can redistribute it and/or modify it > -# under the terms of copyleft-next (version 0.3.1 or later) as published > -# at http://copyleft-next.org/. > - > # This is a stress test script for kmod, the kernel module loader. It uses > # test_kmod which exposes a series of knobs for the API for us so we can > # tweak each test in userspace rather than in kernelspace. > diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh > index f50778a3d744..bfc54b422f25 100755 > --- a/tools/testing/selftests/sysctl/sysctl.sh > +++ b/tools/testing/selftests/sysctl/sysctl.sh > @@ -1,16 +1,6 @@ > #!/bin/bash > +# SPDX-License-Identifier: GPL-2.0-or-later OR copyleft-next-0.3.1 > # Copyright (C) 2017 Luis R. Rodriguez <mcgrof@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; or, when distributed separately from the Linux kernel or > -# when incorporated into other software packages, subject to the following > -# license: > -# > -# This program is free software; you can redistribute it and/or modify it > -# under the terms of copyleft-next (version 0.3.1 or later) as published > -# at http://copyleft-next.org/. > > # This performs a series tests against the proc sysctl interface. > > -- > 2.35.1 Luis, I think you know that I'm not a fan of copyleft-next. However, having said that, this conversion from boilerplate text to SPDX identifier line is very welcome. Thanks for this change. Reviewed-by: Tim Bird <tim.bird@xxxxxxxx> -- Tim
