2019-12-12 15:14:12

by Ed Maste

Subject: [PATCH] perf tools: correct license on jsmn json parser

From: Ed Maste <[email protected]>

These files are part of the jsmn json parser, introduced in 867a979a83.
Correct the SPDX tag to indicate that they are under the MIT license.

Signed-off-by: Ed Maste <[email protected]>
---
tools/perf/pmu-events/jsmn.h | 2 +-
tools/perf/pmu-events/json.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/pmu-events/jsmn.h b/tools/perf/pmu-events/jsmn.h
index c7b0f6ea2a31..1bdfd55fff30 100644
--- a/tools/perf/pmu-events/jsmn.h
+++ b/tools/perf/pmu-events/jsmn.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: MIT */
#ifndef __JSMN_H_
#define __JSMN_H_

diff --git a/tools/perf/pmu-events/json.h b/tools/perf/pmu-events/json.h
index fbcd5a0590ad..7cb29fac8c31 100644
--- a/tools/perf/pmu-events/json.h
+++ b/tools/perf/pmu-events/json.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: MIT */
#ifndef JSON_H
#define JSON_H 1

--
2.24.0

2019-12-12 20:50:06

by Ed Maste

Subject: Re: [PATCH] perf tools: correct license on jsmn json parser

On Thu, 12 Dec 2019 at 10:13, Ed Maste <[email protected]> wrote:
>
> These files are part of the jsmn json parser, introduced in 867a979a83.
> Correct the SPDX tag to indicate that they are under the MIT license.

Oh, it looks like I made a mistake. json.h is actually part of Andi
Kleen's wrapper and I suspect should be 2-clause BSD as json.c is;
I'll leave that to Andi.

jsmn.h is MIT licensed and does have the wrong SPDX tag.

2019-12-13 00:07:52

by Andi Kleen

Subject: Re: [PATCH] perf tools: correct license on jsmn json parser

On Thu, Dec 12, 2019 at 12:00:20PM -0500, Ed Maste wrote:
> On Thu, 12 Dec 2019 at 10:13, Ed Maste <[email protected]> wrote:
> >
> > These files are part of the jsmn json parser, introduced in 867a979a83.
> > Correct the SPDX tag to indicate that they are under the MIT license.
>
> Oh, it looks like I made a mistake. json.h is actually part of Andi
> Kleen's wrapper and I suspect should be 2-clause BSD as json.c is;
> I'll leave that to Andi.
>
> jsmn.h is MIT licensed and does have the wrong SPDX tag.

Yes should fix the jsmn.h tag to MIT license.

Acked-by: Andi Kleen <[email protected]>

-Andi

2019-12-13 15:47:25

by Ed Maste

Subject: [PATCH v2] perf tools: correct license on jsmn json parser

From: Ed Maste <[email protected]>

This header is part of the jsmn json parser, introduced in 867a979a83.
Correct the SPDX tag to indicate that it is under the MIT license.

Signed-off-by: Ed Maste <[email protected]>
Acked-by: Andi Kleen <[email protected]>
---
tools/perf/pmu-events/jsmn.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/pmu-events/jsmn.h b/tools/perf/pmu-events/jsmn.h
index c7b0f6ea2a31..1bdfd55fff30 100644
--- a/tools/perf/pmu-events/jsmn.h
+++ b/tools/perf/pmu-events/jsmn.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: MIT */
#ifndef __JSMN_H_
#define __JSMN_H_

--
2.24.0

2019-12-13 18:56:18

by Andi Kleen

Subject: Re: [PATCH v2] perf tools: correct license on jsmn json parser

Adding Arnaldo for a perf tools change.

On Fri, Dec 13, 2019 at 03:46:25PM +0000, [email protected] wrote:
> From: Ed Maste <[email protected]>
>
> This header is part of the jsmn json parser, introduced in 867a979a83.
> Correct the SPDX tag to indicate that it is under the MIT license.
>
> Signed-off-by: Ed Maste <[email protected]>
> Acked-by: Andi Kleen <[email protected]>
> ---
> tools/perf/pmu-events/jsmn.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/pmu-events/jsmn.h b/tools/perf/pmu-events/jsmn.h
> index c7b0f6ea2a31..1bdfd55fff30 100644
> --- a/tools/perf/pmu-events/jsmn.h
> +++ b/tools/perf/pmu-events/jsmn.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: MIT */
> #ifndef __JSMN_H_
> #define __JSMN_H_
>
> --
> 2.24.0
>

2020-05-28 17:14:07

by Ed Maste

Subject: [RESEND PATCH v2] perf tools: correct license on jsmn json parser

From: Ed Maste <[email protected]>

This header is part of the jsmn json parser, introduced in 867a979a83.
Correct the SPDX tag to indicate that it is under the MIT license.

Signed-off-by: Ed Maste <[email protected]>
Acked-by: Andi Kleen <[email protected]>
---
tools/perf/pmu-events/jsmn.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/pmu-events/jsmn.h b/tools/perf/pmu-events/jsmn.h
index c7b0f6ea2a31..1bdfd55fff30 100644
--- a/tools/perf/pmu-events/jsmn.h
+++ b/tools/perf/pmu-events/jsmn.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: MIT */
#ifndef __JSMN_H_
#define __JSMN_H_

--
2.24.0

2020-05-29 16:09:44

by Arnaldo Carvalho de Melo

Subject: Re: [RESEND PATCH v2] perf tools: correct license on jsmn json parser

Em Thu, May 28, 2020 at 05:08:59PM +0000, Ed Maste escreveu:
> From: Ed Maste <[email protected]>
>
> This header is part of the jsmn json parser, introduced in 867a979a83.
> Correct the SPDX tag to indicate that it is under the MIT license.

Thanks, applied.

- Arnaldo

> Signed-off-by: Ed Maste <[email protected]>
> Acked-by: Andi Kleen <[email protected]>
> ---
> tools/perf/pmu-events/jsmn.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/pmu-events/jsmn.h b/tools/perf/pmu-events/jsmn.h
> index c7b0f6ea2a31..1bdfd55fff30 100644
> --- a/tools/perf/pmu-events/jsmn.h
> +++ b/tools/perf/pmu-events/jsmn.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: MIT */
> #ifndef __JSMN_H_
> #define __JSMN_H_
>
> --
> 2.24.0
>

--

- Arnaldo