* Re: [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore
2021-11-05 22:19 [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore Quentin Monnet
@ 2021-11-05 22:21 ` Andrii Nakryiko
2021-11-08 11:20 ` Tobias Klauser
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Andrii Nakryiko @ 2021-11-05 22:21 UTC (permalink / raw)
To: Quentin Monnet
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Networking,
bpf, Andrii Nakryiko, Ilya Leoshkevich, Jakub Kicinski,
Jean-Philippe Brucker, Jesper Dangaard Brouer, Jiri Olsa,
Joe Stringer, Peter Wu, Roman Gushchin, Song Liu,
Stanislav Fomichev, Tobias Klauser
On Fri, Nov 5, 2021 at 3:19 PM Quentin Monnet <quentin@isovalent.com> wrote:
>
> Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
> 907b22365115 ("tools: bpftool: dual license all files") we made sure
> that all its source files were indeed covered by the two licenses, and
> that they had the correct SPDX tags.
>
> However, bpftool's Makefile, the Makefile for its documentation, and the
> .gitignore file were skipped at the time (their GPL-2.0-only tag was
> added later). Let's update the tags.
>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Andrii Nakryiko <andriin@fb.com>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
> Cc: Ilya Leoshkevich <iii@linux.ibm.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>
> Cc: Jesper Dangaard Brouer <brouer@redhat.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Joe Stringer <joe@cilium.io>
> Cc: Peter Wu <peter@lekensteyn.nl>
> Cc: Roman Gushchin <guro@fb.com>
> Cc: Song Liu <songliubraving@fb.com>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Tobias Klauser <tklauser@distanz.ch>
> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
> ---
> tools/bpf/bpftool/.gitignore | 2 +-
> tools/bpf/bpftool/Documentation/Makefile | 2 +-
> tools/bpf/bpftool/Makefile | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/bpf/bpftool/.gitignore b/tools/bpf/bpftool/.gitignore
> index 05ce4446b780..a736f64dc5dc 100644
> --- a/tools/bpf/bpftool/.gitignore
> +++ b/tools/bpf/bpftool/.gitignore
> @@ -1,4 +1,4 @@
> -# SPDX-License-Identifier: GPL-2.0-only
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> *.d
> /bootstrap/
> /bpftool
> diff --git a/tools/bpf/bpftool/Documentation/Makefile b/tools/bpf/bpftool/Documentation/Makefile
> index c49487905ceb..44b60784847b 100644
> --- a/tools/bpf/bpftool/Documentation/Makefile
> +++ b/tools/bpf/bpftool/Documentation/Makefile
> @@ -1,4 +1,4 @@
> -# SPDX-License-Identifier: GPL-2.0-only
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> include ../../../scripts/Makefile.include
> include ../../../scripts/utilities.mak
>
> diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
> index c0c30e56988f..622568c7a9b8 100644
> --- a/tools/bpf/bpftool/Makefile
> +++ b/tools/bpf/bpftool/Makefile
> @@ -1,4 +1,4 @@
> -# SPDX-License-Identifier: GPL-2.0-only
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> include ../../scripts/Makefile.include
> include ../../scripts/utilities.mak
>
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore
2021-11-05 22:19 [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore Quentin Monnet
2021-11-05 22:21 ` Andrii Nakryiko
@ 2021-11-08 11:20 ` Tobias Klauser
2021-11-09 22:25 ` Joe Stringer
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Tobias Klauser @ 2021-11-08 11:20 UTC (permalink / raw)
To: Quentin Monnet
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, netdev, bpf,
Andrii Nakryiko, Ilya Leoshkevich, Jakub Kicinski,
Jean-Philippe Brucker, Jesper Dangaard Brouer, Jiri Olsa,
Joe Stringer, Peter Wu, Roman Gushchin, Song Liu,
Stanislav Fomichev
On 2021-11-05 at 23:19:04 +0100, Quentin Monnet <quentin@isovalent.com> wrote:
> Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
> 907b22365115 ("tools: bpftool: dual license all files") we made sure
> that all its source files were indeed covered by the two licenses, and
> that they had the correct SPDX tags.
>
> However, bpftool's Makefile, the Makefile for its documentation, and the
> .gitignore file were skipped at the time (their GPL-2.0-only tag was
> added later). Let's update the tags.
>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Andrii Nakryiko <andriin@fb.com>
> Cc: Ilya Leoshkevich <iii@linux.ibm.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>
> Cc: Jesper Dangaard Brouer <brouer@redhat.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Joe Stringer <joe@cilium.io>
> Cc: Peter Wu <peter@lekensteyn.nl>
> Cc: Roman Gushchin <guro@fb.com>
> Cc: Song Liu <songliubraving@fb.com>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Tobias Klauser <tklauser@distanz.ch>
Thanks
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore
2021-11-05 22:19 [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore Quentin Monnet
2021-11-05 22:21 ` Andrii Nakryiko
2021-11-08 11:20 ` Tobias Klauser
@ 2021-11-09 22:25 ` Joe Stringer
2021-11-09 22:28 ` Song Liu
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Joe Stringer @ 2021-11-09 22:25 UTC (permalink / raw)
To: Quentin Monnet
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, netdev, bpf,
Andrii Nakryiko, Ilya Leoshkevich, Jakub Kicinski,
Jean-Philippe Brucker, Jesper Dangaard Brouer, Jiri Olsa,
Peter Wu, Roman Gushchin, Song Liu, Stanislav Fomichev,
Tobias Klauser
On Fri, Nov 5, 2021 at 3:19 PM Quentin Monnet <quentin@isovalent.com> wrote:
>
> Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
> 907b22365115 ("tools: bpftool: dual license all files") we made sure
> that all its source files were indeed covered by the two licenses, and
> that they had the correct SPDX tags.
>
> However, bpftool's Makefile, the Makefile for its documentation, and the
> .gitignore file were skipped at the time (their GPL-2.0-only tag was
> added later). Let's update the tags.
>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Andrii Nakryiko <andriin@fb.com>
> Cc: Ilya Leoshkevich <iii@linux.ibm.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>
> Cc: Jesper Dangaard Brouer <brouer@redhat.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Joe Stringer <joe@cilium.io>
> Cc: Peter Wu <peter@lekensteyn.nl>
> Cc: Roman Gushchin <guro@fb.com>
> Cc: Song Liu <songliubraving@fb.com>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Tobias Klauser <tklauser@distanz.ch>
> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Acked-by: Joe Stringer <joe@cilium.io>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore
2021-11-05 22:19 [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore Quentin Monnet
` (2 preceding siblings ...)
2021-11-09 22:25 ` Joe Stringer
@ 2021-11-09 22:28 ` Song Liu
2021-11-10 8:36 ` Jean-Philippe Brucker
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Song Liu @ 2021-11-09 22:28 UTC (permalink / raw)
To: Quentin Monnet
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Networking,
bpf, Andrii Nakryiko, Ilya Leoshkevich, Jakub Kicinski,
Jean-Philippe Brucker, Jesper Dangaard Brouer, Jiri Olsa,
Joe Stringer, Peter Wu, Roman Gushchin, Stanislav Fomichev,
Tobias Klauser
> On Nov 5, 2021, at 3:19 PM, Quentin Monnet <quentin@isovalent.com> wrote:
>
> Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
> 907b22365115 ("tools: bpftool: dual license all files") we made sure
> that all its source files were indeed covered by the two licenses, and
> that they had the correct SPDX tags.
>
> However, bpftool's Makefile, the Makefile for its documentation, and the
> .gitignore file were skipped at the time (their GPL-2.0-only tag was
> added later). Let's update the tags.
>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Andrii Nakryiko <andriin@fb.com>
> Cc: Ilya Leoshkevich <iii@linux.ibm.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>
> Cc: Jesper Dangaard Brouer <brouer@redhat.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Joe Stringer <joe@cilium.io>
> Cc: Peter Wu <peter@lekensteyn.nl>
> Cc: Roman Gushchin <guro@fb.com>
> Cc: Song Liu <songliubraving@fb.com>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Tobias Klauser <tklauser@distanz.ch>
> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Acked-by: Song Liu <songliubraving@fb.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore
2021-11-05 22:19 [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore Quentin Monnet
` (3 preceding siblings ...)
2021-11-09 22:28 ` Song Liu
@ 2021-11-10 8:36 ` Jean-Philippe Brucker
2021-11-10 8:53 ` Jesper Dangaard Brouer
2021-11-10 15:10 ` Jakub Kicinski
6 siblings, 0 replies; 9+ messages in thread
From: Jean-Philippe Brucker @ 2021-11-10 8:36 UTC (permalink / raw)
To: Quentin Monnet
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, netdev, bpf,
Andrii Nakryiko, Ilya Leoshkevich, Jakub Kicinski,
Jesper Dangaard Brouer, Jiri Olsa, Joe Stringer, Peter Wu,
Roman Gushchin, Song Liu, Stanislav Fomichev, Tobias Klauser
On Fri, Nov 05, 2021 at 10:19:04PM +0000, Quentin Monnet wrote:
> Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
> 907b22365115 ("tools: bpftool: dual license all files") we made sure
> that all its source files were indeed covered by the two licenses, and
> that they had the correct SPDX tags.
>
> However, bpftool's Makefile, the Makefile for its documentation, and the
> .gitignore file were skipped at the time (their GPL-2.0-only tag was
> added later). Let's update the tags.
>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Andrii Nakryiko <andriin@fb.com>
> Cc: Ilya Leoshkevich <iii@linux.ibm.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>
> Cc: Jesper Dangaard Brouer <brouer@redhat.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Joe Stringer <joe@cilium.io>
> Cc: Peter Wu <peter@lekensteyn.nl>
> Cc: Roman Gushchin <guro@fb.com>
> Cc: Song Liu <songliubraving@fb.com>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Tobias Klauser <tklauser@distanz.ch>
> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Acked-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore
2021-11-05 22:19 [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore Quentin Monnet
` (4 preceding siblings ...)
2021-11-10 8:36 ` Jean-Philippe Brucker
@ 2021-11-10 8:53 ` Jesper Dangaard Brouer
2021-11-10 15:10 ` Jakub Kicinski
6 siblings, 0 replies; 9+ messages in thread
From: Jesper Dangaard Brouer @ 2021-11-10 8:53 UTC (permalink / raw)
To: Quentin Monnet, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko
Cc: brouer, netdev, bpf, Andrii Nakryiko, Ilya Leoshkevich,
Jakub Kicinski, Jean-Philippe Brucker, Jiri Olsa, Joe Stringer,
Peter Wu, Roman Gushchin, Song Liu, Stanislav Fomichev,
Tobias Klauser
On 05/11/2021 23.19, Quentin Monnet wrote:
> Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
> 907b22365115 ("tools: bpftool: dual license all files") we made sure
> that all its source files were indeed covered by the two licenses, and
> that they had the correct SPDX tags.
>
> However, bpftool's Makefile, the Makefile for its documentation, and the
> .gitignore file were skipped at the time (their GPL-2.0-only tag was
> added later). Let's update the tags.
>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Andrii Nakryiko <andriin@fb.com>
> Cc: Ilya Leoshkevich <iii@linux.ibm.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>
> Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Joe Stringer <joe@cilium.io>
> Cc: Peter Wu <peter@lekensteyn.nl>
> Cc: Roman Gushchin <guro@fb.com>
> Cc: Song Liu <songliubraving@fb.com>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Tobias Klauser <tklauser@distanz.ch>
> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
> ---
> tools/bpf/bpftool/.gitignore | 2 +-
> tools/bpf/bpftool/Documentation/Makefile | 2 +-
> tools/bpf/bpftool/Makefile | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/bpf/bpftool/.gitignore b/tools/bpf/bpftool/.gitignore
> index 05ce4446b780..a736f64dc5dc 100644
> --- a/tools/bpf/bpftool/.gitignore
> +++ b/tools/bpf/bpftool/.gitignore
> @@ -1,4 +1,4 @@
> -# SPDX-License-Identifier: GPL-2.0-only
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> *.d
> /bootstrap/
> /bpftool
> diff --git a/tools/bpf/bpftool/Documentation/Makefile b/tools/bpf/bpftool/Documentation/Makefile
> index c49487905ceb..44b60784847b 100644
> --- a/tools/bpf/bpftool/Documentation/Makefile
> +++ b/tools/bpf/bpftool/Documentation/Makefile
> @@ -1,4 +1,4 @@
> -# SPDX-License-Identifier: GPL-2.0-only
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> include ../../../scripts/Makefile.include
> include ../../../scripts/utilities.mak
>
> diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
> index c0c30e56988f..622568c7a9b8 100644
> --- a/tools/bpf/bpftool/Makefile
> +++ b/tools/bpf/bpftool/Makefile
> @@ -1,4 +1,4 @@
> -# SPDX-License-Identifier: GPL-2.0-only
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> include ../../scripts/Makefile.include
> include ../../scripts/utilities.mak
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore
2021-11-05 22:19 [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore Quentin Monnet
` (5 preceding siblings ...)
2021-11-10 8:53 ` Jesper Dangaard Brouer
@ 2021-11-10 15:10 ` Jakub Kicinski
2021-11-10 17:03 ` Alexei Starovoitov
6 siblings, 1 reply; 9+ messages in thread
From: Jakub Kicinski @ 2021-11-10 15:10 UTC (permalink / raw)
To: Quentin Monnet
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, netdev, bpf,
Andrii Nakryiko, Ilya Leoshkevich, Jean-Philippe Brucker,
Jesper Dangaard Brouer, Jiri Olsa, Joe Stringer, Peter Wu,
Roman Gushchin, Song Liu, Stanislav Fomichev, Tobias Klauser
On Fri, 5 Nov 2021 22:19:04 +0000 Quentin Monnet wrote:
> Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
> 907b22365115 ("tools: bpftool: dual license all files") we made sure
> that all its source files were indeed covered by the two licenses, and
> that they had the correct SPDX tags.
>
> However, bpftool's Makefile, the Makefile for its documentation, and the
> .gitignore file were skipped at the time (their GPL-2.0-only tag was
> added later). Let's update the tags.
>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Andrii Nakryiko <andriin@fb.com>
> Cc: Ilya Leoshkevich <iii@linux.ibm.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
Acked-by: Jakub Kicinski <kuba@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore
2021-11-10 15:10 ` Jakub Kicinski
@ 2021-11-10 17:03 ` Alexei Starovoitov
0 siblings, 0 replies; 9+ messages in thread
From: Alexei Starovoitov @ 2021-11-10 17:03 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Quentin Monnet, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Network Development, bpf, Andrii Nakryiko,
Ilya Leoshkevich, Jean-Philippe Brucker, Jesper Dangaard Brouer,
Jiri Olsa, Joe Stringer, Peter Wu, Roman Gushchin, Song Liu,
Stanislav Fomichev, Tobias Klauser
On Wed, Nov 10, 2021 at 7:10 AM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Fri, 5 Nov 2021 22:19:04 +0000 Quentin Monnet wrote:
> > Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
> > 907b22365115 ("tools: bpftool: dual license all files") we made sure
> > that all its source files were indeed covered by the two licenses, and
> > that they had the correct SPDX tags.
> >
> > However, bpftool's Makefile, the Makefile for its documentation, and the
> > .gitignore file were skipped at the time (their GPL-2.0-only tag was
> > added later). Let's update the tags.
> >
> > Cc: Alexei Starovoitov <ast@kernel.org>
> > Cc: Andrii Nakryiko <andriin@fb.com>
> > Cc: Ilya Leoshkevich <iii@linux.ibm.com>
> > Cc: Jakub Kicinski <kuba@kernel.org>
>
> Acked-by: Jakub Kicinski <kuba@kernel.org>
Applied. Thanks everyone.
^ permalink raw reply [flat|nested] 9+ messages in thread