As suggested by Thomas Gleixner, I'm following up to move on with
the SPDX tag needed for copyleft-next-0.3.1. I've split this out
from the test_sysfs selftest so to separate review from that.
Changes on this v11:
o Fixed a minor typo on patch #2 as noted by Kees Cook
o Added Reviewed-by tags by Kees Cook
Changes on this v10:
o embraced paragraph from Thomas Gleixner which helps explain why
the OR operator in the SPDX license name
o dropped the GPL-2.0 and GPL-2.0+ tags as suggested by Thomas Gleixner
as these are outdated (still valid) in the SPDX spec
o trimmed the Cc list to remove the test_sysfs / block layer / fs folks as
the test_sysfs stuff is now dropped from consideration in this series
Prior to this the series was at v9 but it also had the test_sysfs and its
changes, its history can be found here:
https://lore.kernel.org/all/[email protected]/
Luis Chamberlain (2):
LICENSES: Add the copyleft-next-0.3.1 license
testing: use the copyleft-next-0.3.1 SPDX tag
LICENSES/dual/copyleft-next-0.3.1 | 236 +++++++++++++++++++++++
lib/test_kmod.c | 12 +-
lib/test_sysctl.c | 12 +-
tools/testing/selftests/kmod/kmod.sh | 13 +-
tools/testing/selftests/sysctl/sysctl.sh | 12 +-
5 files changed, 240 insertions(+), 45 deletions(-)
create mode 100644 LICENSES/dual/copyleft-next-0.3.1
--
2.35.1
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 <[email protected]>
Cc: Kuno Woudt <[email protected]>
Cc: Richard Fontana <[email protected]>
Cc: [email protected]
Cc: Ciaran Farrell <[email protected]>
Cc: Christopher De Nicolo <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Thorsten Leemhuis <[email protected]>
Cc: Andrew Morton <[email protected]>
Reviewed-by: Kees Cook <[email protected]>
Signed-off-by: Luis Chamberlain <[email protected]>
---
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 <[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; 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 <[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; 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 <[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; 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 <[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; 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
> -----Original Message-----
> From: Luis Chamberlain <[email protected]> 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 <[email protected]>
> Cc: Kuno Woudt <[email protected]>
> Cc: Richard Fontana <[email protected]>
> Cc: [email protected]
> Cc: Ciaran Farrell <[email protected]>
> Cc: Christopher De Nicolo <[email protected]>
> Cc: Christoph Hellwig <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Jonathan Corbet <[email protected]>
> Cc: Thorsten Leemhuis <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Reviewed-by: Kees Cook <[email protected]>
> Signed-off-by: Luis Chamberlain <[email protected]>
> ---
> 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 <[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; 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 <[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; 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 <[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; 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 <[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; 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 <[email protected]>
-- Tim
On Mon, Oct 03, 2022 at 09:58:47AM -0700, Luis Chamberlain wrote:
> As suggested by Thomas Gleixner, I'm following up to move on with
> the SPDX tag needed for copyleft-next-0.3.1. I've split this out
> from the test_sysfs selftest so to separate review from that.
>
> Changes on this v11:
> o Fixed a minor typo on patch #2 as noted by Kees Cook
> o Added Reviewed-by tags by Kees Cook
>
> Changes on this v10:
> o embraced paragraph from Thomas Gleixner which helps explain why
> the OR operator in the SPDX license name
> o dropped the GPL-2.0 and GPL-2.0+ tags as suggested by Thomas Gleixner
> as these are outdated (still valid) in the SPDX spec
> o trimmed the Cc list to remove the test_sysfs / block layer / fs folks as
> the test_sysfs stuff is now dropped from consideration in this series
>
> Prior to this the series was at v9 but it also had the test_sysfs and its
> changes, its history can be found here:
>
> https://lore.kernel.org/all/[email protected]/
>
> Luis Chamberlain (2):
> LICENSES: Add the copyleft-next-0.3.1 license
> testing: use the copyleft-next-0.3.1 SPDX tag
>
> LICENSES/dual/copyleft-next-0.3.1 | 236 +++++++++++++++++++++++
> lib/test_kmod.c | 12 +-
> lib/test_sysctl.c | 12 +-
> tools/testing/selftests/kmod/kmod.sh | 13 +-
> tools/testing/selftests/sysctl/sysctl.sh | 12 +-
> 5 files changed, 240 insertions(+), 45 deletions(-)
> create mode 100644 LICENSES/dual/copyleft-next-0.3.1
*poke*
Luis
On Wed, Oct 19, 2022 at 06:26:45AM -0700, Luis Chamberlain wrote:
> On Mon, Oct 03, 2022 at 09:58:47AM -0700, Luis Chamberlain wrote:
> > As suggested by Thomas Gleixner, I'm following up to move on with
> > the SPDX tag needed for copyleft-next-0.3.1. I've split this out
> > from the test_sysfs selftest so to separate review from that.
> >
> > Changes on this v11:
> > o Fixed a minor typo on patch #2 as noted by Kees Cook
> > o Added Reviewed-by tags by Kees Cook
> >
> > Changes on this v10:
> > o embraced paragraph from Thomas Gleixner which helps explain why
> > the OR operator in the SPDX license name
> > o dropped the GPL-2.0 and GPL-2.0+ tags as suggested by Thomas Gleixner
> > as these are outdated (still valid) in the SPDX spec
> > o trimmed the Cc list to remove the test_sysfs / block layer / fs folks as
> > the test_sysfs stuff is now dropped from consideration in this series
> >
> > Prior to this the series was at v9 but it also had the test_sysfs and its
> > changes, its history can be found here:
> >
> > https://lore.kernel.org/all/[email protected]/
> >
> > Luis Chamberlain (2):
> > LICENSES: Add the copyleft-next-0.3.1 license
> > testing: use the copyleft-next-0.3.1 SPDX tag
> >
> > LICENSES/dual/copyleft-next-0.3.1 | 236 +++++++++++++++++++++++
> > lib/test_kmod.c | 12 +-
> > lib/test_sysctl.c | 12 +-
> > tools/testing/selftests/kmod/kmod.sh | 13 +-
> > tools/testing/selftests/sysctl/sysctl.sh | 12 +-
> > 5 files changed, 240 insertions(+), 45 deletions(-)
> > create mode 100644 LICENSES/dual/copyleft-next-0.3.1
>
> *poke*
It's been 2 days since the merge window ended. And my todo queue is:
$ mdfrm -c todo/
1410 messages in todo/
Please give me a chance to catch up...
thanks,
greg k-h