Precise and non-ambiguous license information is important. The recent
relicensing of the bpftools introduced a license conflict.
The files have now:
SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause
and
* 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
Amazingly about 20 people acked that change and neither they nor the
committer noticed. Oh well.
Digging deeper: The files were imported from the iproute2 repository with
the GPL V2 or later boiler plate text in commit b66e907cfee2 ("tools:
bpftool: copy JSON writer from iproute2 repository")
Looking at the iproute2 repository at
git://git.kernel.org/pub/scm/network/iproute2/iproute2.git
the following commit is the equivivalent:
commit d9d8c839 ("json_writer: add SPDX Identifier (GPL-2/BSD-2)")
That commit explicitly removes the boiler plate and relicenses the code
uner GPL-2.0-only and BSD-2-Clause. As Steven wrote the original code and
also the relicensing commit, it's assumed that the relicensing was intended
to do exaclty that. Just the kernel side update failed to remove the boiler
plate. Do so now.
Fixes: 907b22365115 ("tools: bpftool: dual license all files")
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Cc: Roman Gushchin <[email protected]>
Cc: YueHaibing <[email protected]>
Cc: Yonghong Song <[email protected]>
Cc: Stanislav Fomichev <[email protected]>
Cc: Sean Young <[email protected]>
Cc: Jiri Benc <[email protected]>
Cc: David Calavera <[email protected]>
Cc: Andrey Ignatov <[email protected]>
Cc: Joe Stringer <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Alexei Starovoitov <[email protected]>
Cc: Petar Penkov <[email protected]>
Cc: Sandipan Das <[email protected]>
Cc: Prashant Bhole <[email protected]>
Cc: Stephen Hemminger <[email protected]>
Cc: John Fastabend <[email protected]>
Cc: Taeung Song <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Alexei Starovoitov <[email protected]>
Cc: Daniel Borkmann <[email protected]>
Cc: Quentin Monnet <[email protected]>
CC: [email protected]
Cc: [email protected]
---
P.S.: This patch is part of a larger cleanup, but independent of other
patches and is intended to be picked up by the maintainer directly.
---
tools/bpf/bpftool/json_writer.c | 7 +------
tools/bpf/bpftool/json_writer.h | 5 -----
2 files changed, 1 insertion(+), 11 deletions(-)
--- a/tools/bpf/bpftool/json_writer.c
+++ b/tools/bpf/bpftool/json_writer.c
@@ -1,15 +1,10 @@
-// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
/*
* Simple streaming JSON writer
*
* This takes care of the annoying bits of JSON syntax like the commas
* after elements
*
- * 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.
- *
* Authors: Stephen Hemminger <[email protected]>
*/
--- a/tools/bpf/bpftool/json_writer.h
+++ b/tools/bpf/bpftool/json_writer.h
@@ -5,11 +5,6 @@
* This takes care of the annoying bits of JSON syntax like the commas
* after elements
*
- * 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.
- *
* Authors: Stephen Hemminger <[email protected]>
*/
On Fri, 18 Jan 2019 00:14:24 +0100, Thomas Gleixner wrote:
> Precise and non-ambiguous license information is important. The recent
> relicensing of the bpftools introduced a license conflict.
>
> The files have now:
>
> SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause
>
> and
>
> * 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
>
> Amazingly about 20 people acked that change and neither they nor the
> committer noticed. Oh well.
Acked-by: Jakub Kicinski <[email protected]>
Sorry about that!
These files as you found out are from Stephen, so we probably don't
need the full litany of acks.
On Thu, 17 Jan 2019, Jakub Kicinski wrote:
> On Fri, 18 Jan 2019 00:14:24 +0100, Thomas Gleixner wrote:
> > Precise and non-ambiguous license information is important. The recent
> > relicensing of the bpftools introduced a license conflict.
> >
> > The files have now:
> >
> > SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause
> >
> > and
> >
> > * 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
> >
> > Amazingly about 20 people acked that change and neither they nor the
> > committer noticed. Oh well.
>
> Acked-by: Jakub Kicinski <[email protected]>
>
> Sorry about that!
>
> These files as you found out are from Stephen, so we probably don't
> need the full litany of acks.
I agree. I cc'ed everyone just to make them aware that licensing is not
just an annoyance. It's a important part of the project and it has legal
implications - in the worst case on the personal level. We already have an
unholy mess in that area, so we really need everybody to take it serious.
Thanks,
tglx
On Fri, Jan 18, 2019 at 12:14:24AM +0100, Thomas Gleixner wrote:
> Precise and non-ambiguous license information is important. The recent
> relicensing of the bpftools introduced a license conflict.
>
> The files have now:
>
> SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause
>
> and
>
> * 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
>
> Amazingly about 20 people acked that change and neither they nor the
> committer noticed. Oh well.
>
> Digging deeper: The files were imported from the iproute2 repository with
> the GPL V2 or later boiler plate text in commit b66e907cfee2 ("tools:
> bpftool: copy JSON writer from iproute2 repository")
>
> Looking at the iproute2 repository at
>
> git://git.kernel.org/pub/scm/network/iproute2/iproute2.git
>
> the following commit is the equivivalent:
>
> commit d9d8c839 ("json_writer: add SPDX Identifier (GPL-2/BSD-2)")
>
> That commit explicitly removes the boiler plate and relicenses the code
> uner GPL-2.0-only and BSD-2-Clause. As Steven wrote the original code and
> also the relicensing commit, it's assumed that the relicensing was intended
> to do exaclty that. Just the kernel side update failed to remove the boiler
> plate. Do so now.
>
> Fixes: 907b22365115 ("tools: bpftool: dual license all files")
> Signed-off-by: Thomas Gleixner <[email protected]>
> Cc: Jakub Kicinski <[email protected]>
> Cc: Roman Gushchin <[email protected]>
> Cc: YueHaibing <[email protected]>
> Cc: Yonghong Song <[email protected]>
> Cc: Stanislav Fomichev <[email protected]>
> Cc: Sean Young <[email protected]>
> Cc: Jiri Benc <[email protected]>
> Cc: David Calavera <[email protected]>
> Cc: Andrey Ignatov <[email protected]>
> Cc: Joe Stringer <[email protected]>
> Cc: David Ahern <[email protected]>
> Cc: Alexei Starovoitov <[email protected]>
> Cc: Petar Penkov <[email protected]>
> Cc: Sandipan Das <[email protected]>
> Cc: Prashant Bhole <[email protected]>
> Cc: Stephen Hemminger <[email protected]>
> Cc: John Fastabend <[email protected]>
> Cc: Taeung Song <[email protected]>
> Cc: Jiri Olsa <[email protected]>
> Cc: Alexei Starovoitov <[email protected]>
> Cc: Daniel Borkmann <[email protected]>
> Cc: Quentin Monnet <[email protected]>
> CC: [email protected]
> Cc: [email protected]
> ---
>
> P.S.: This patch is part of a larger cleanup, but independent of other
> patches and is intended to be picked up by the maintainer directly.
Applied this patch to bpf tree.
Sorry about this mess.