linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] perf tools: correct license on jsmn json parser
@ 2019-12-12 15:12 Ed Maste
  2019-12-12 17:00 ` Ed Maste
  2019-12-13 15:46 ` [PATCH v2] " emaste
  0 siblings, 2 replies; 7+ messages in thread
From: Ed Maste @ 2019-12-12 15:12 UTC (permalink / raw)
  To: linux-kernel; +Cc: Andi Kleen, Greg Kroah-Hartman, Ed Maste

From: Ed Maste <emaste@freebsd.org>

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 <emaste@freebsd.org>
---
 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH] perf tools: correct license on jsmn json parser
  2019-12-12 15:12 [PATCH] perf tools: correct license on jsmn json parser Ed Maste
@ 2019-12-12 17:00 ` Ed Maste
  2019-12-12 23:49   ` Andi Kleen
  2019-12-13 15:46 ` [PATCH v2] " emaste
  1 sibling, 1 reply; 7+ messages in thread
From: Ed Maste @ 2019-12-12 17:00 UTC (permalink / raw)
  To: Ed Maste; +Cc: linux-kernel, Andi Kleen, Greg Kroah-Hartman

On Thu, 12 Dec 2019 at 10:13, Ed Maste <emaste@freefall.freebsd.org> 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.

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] perf tools: correct license on jsmn json parser
  2019-12-12 17:00 ` Ed Maste
@ 2019-12-12 23:49   ` Andi Kleen
  0 siblings, 0 replies; 7+ messages in thread
From: Andi Kleen @ 2019-12-12 23:49 UTC (permalink / raw)
  To: Ed Maste; +Cc: Ed Maste, linux-kernel, Greg Kroah-Hartman

On Thu, Dec 12, 2019 at 12:00:20PM -0500, Ed Maste wrote:
> On Thu, 12 Dec 2019 at 10:13, Ed Maste <emaste@freefall.freebsd.org> 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 <ak@linux.intel.com>

-Andi

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH v2] perf tools: correct license on jsmn json parser
  2019-12-12 15:12 [PATCH] perf tools: correct license on jsmn json parser Ed Maste
  2019-12-12 17:00 ` Ed Maste
@ 2019-12-13 15:46 ` emaste
  2019-12-13 18:55   ` Andi Kleen
  2020-05-28 17:08   ` [RESEND PATCH " Ed Maste
  1 sibling, 2 replies; 7+ messages in thread
From: emaste @ 2019-12-13 15:46 UTC (permalink / raw)
  To: linux-kernel; +Cc: Andi Kleen, Greg Kroah-Hartman, Ed Maste

From: Ed Maste <emaste@freebsd.org>

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 <emaste@freebsd.org>
Acked-by: Andi Kleen <ak@linux.intel.com>
---
 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH v2] perf tools: correct license on jsmn json parser
  2019-12-13 15:46 ` [PATCH v2] " emaste
@ 2019-12-13 18:55   ` Andi Kleen
  2020-05-28 17:08   ` [RESEND PATCH " Ed Maste
  1 sibling, 0 replies; 7+ messages in thread
From: Andi Kleen @ 2019-12-13 18:55 UTC (permalink / raw)
  To: emaste; +Cc: linux-kernel, Greg Kroah-Hartman, acme


Adding Arnaldo for a perf tools change.

On Fri, Dec 13, 2019 at 03:46:25PM +0000, emaste@FreeBSD.org wrote:
> From: Ed Maste <emaste@freebsd.org>
> 
> 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 <emaste@freebsd.org>
> Acked-by: Andi Kleen <ak@linux.intel.com>
> ---
>  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
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [RESEND PATCH v2] perf tools: correct license on jsmn json parser
  2019-12-13 15:46 ` [PATCH v2] " emaste
  2019-12-13 18:55   ` Andi Kleen
@ 2020-05-28 17:08   ` Ed Maste
  2020-05-29 16:05     ` Arnaldo Carvalho de Melo
  1 sibling, 1 reply; 7+ messages in thread
From: Ed Maste @ 2020-05-28 17:08 UTC (permalink / raw)
  To: linux-kernel; +Cc: Ed Maste, Andi Kleen, Greg Kroah-Hartman, acme

From: Ed Maste <emaste@freebsd.org>

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 <emaste@freebsd.org>
Acked-by: Andi Kleen <ak@linux.intel.com>
---
 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [RESEND PATCH v2] perf tools: correct license on jsmn json parser
  2020-05-28 17:08   ` [RESEND PATCH " Ed Maste
@ 2020-05-29 16:05     ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-05-29 16:05 UTC (permalink / raw)
  To: Ed Maste; +Cc: linux-kernel, Ed Maste, Andi Kleen, Greg Kroah-Hartman

Em Thu, May 28, 2020 at 05:08:59PM +0000, Ed Maste escreveu:
> From: Ed Maste <emaste@freebsd.org>
> 
> 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 <emaste@freebsd.org>
> Acked-by: Andi Kleen <ak@linux.intel.com>
> ---
>  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

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-05-29 16:05 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-12 15:12 [PATCH] perf tools: correct license on jsmn json parser Ed Maste
2019-12-12 17:00 ` Ed Maste
2019-12-12 23:49   ` Andi Kleen
2019-12-13 15:46 ` [PATCH v2] " emaste
2019-12-13 18:55   ` Andi Kleen
2020-05-28 17:08   ` [RESEND PATCH " Ed Maste
2020-05-29 16:05     ` Arnaldo Carvalho de Melo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).