| Message ID | 20180907070821.24167-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: fix SPDX license identifiers | expand |
Quoting Jani Nikula (2018-09-07 08:08:21) > Commit b24413180f56 ("License cleanup: add SPDX GPL-2.0 license > identifier to files with no license") added default GPL-2.0 identifiers > to i915 files without a license. For i915 the right choice would have > been MIT. Fix it. > > Fixes: b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_trace.h | 2 +- > drivers/gpu/drm/i915/i915_trace_points.c | 2 +- > drivers/gpu/drm/i915/intel_acpi.c | 2 +- > drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h > index b50c6b829715..a3952af63503 100644 > --- a/drivers/gpu/drm/i915/i915_trace.h > +++ b/drivers/gpu/drm/i915/i915_trace.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: MIT */ > #if !defined(_I915_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) > #define _I915_TRACE_H_ > > diff --git a/drivers/gpu/drm/i915/i915_trace_points.c b/drivers/gpu/drm/i915/i915_trace_points.c > index 463a7177997c..15891addec93 100644 > --- a/drivers/gpu/drm/i915/i915_trace_points.c > +++ b/drivers/gpu/drm/i915/i915_trace_points.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: MIT I think strictly the tracepoint code has to be at least GPL-2.0 as it includes mechanism that is GPL-2.0. -Chris
On Fri, Sep 07, 2018 at 10:08:21AM +0300, Jani Nikula wrote: > Commit b24413180f56 ("License cleanup: add SPDX GPL-2.0 license > identifier to files with no license") added default GPL-2.0 identifiers > to i915 files without a license. For i915 the right choice would have > been MIT. Fix it. > > Fixes: b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/i915_trace.h | 2 +- > drivers/gpu/drm/i915/i915_trace_points.c | 2 +- > drivers/gpu/drm/i915/intel_acpi.c | 2 +- > drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h > index b50c6b829715..a3952af63503 100644 > --- a/drivers/gpu/drm/i915/i915_trace.h > +++ b/drivers/gpu/drm/i915/i915_trace.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: MIT */ > #if !defined(_I915_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) > #define _I915_TRACE_H_ > > diff --git a/drivers/gpu/drm/i915/i915_trace_points.c b/drivers/gpu/drm/i915/i915_trace_points.c > index 463a7177997c..15891addec93 100644 > --- a/drivers/gpu/drm/i915/i915_trace_points.c > +++ b/drivers/gpu/drm/i915/i915_trace_points.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: MIT > /* > * Copyright © 2009 Intel Corporation > * > diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c > index 6ba478e57b9b..5de5131884e1 100644 > --- a/drivers/gpu/drm/i915/intel_acpi.c > +++ b/drivers/gpu/drm/i915/intel_acpi.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: MIT > /* > * Intel ACPI functions > * > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h > index 3f6920dd7880..50ce94a0f31c 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.h > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: MIT */ > #ifndef _INTEL_RINGBUFFER_H_ > #define _INTEL_RINGBUFFER_H_ > > -- > 2.11.0 >
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index b50c6b829715..a3952af63503 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: MIT */ #if !defined(_I915_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) #define _I915_TRACE_H_ diff --git a/drivers/gpu/drm/i915/i915_trace_points.c b/drivers/gpu/drm/i915/i915_trace_points.c index 463a7177997c..15891addec93 100644 --- a/drivers/gpu/drm/i915/i915_trace_points.c +++ b/drivers/gpu/drm/i915/i915_trace_points.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: MIT /* * Copyright © 2009 Intel Corporation * diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index 6ba478e57b9b..5de5131884e1 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: MIT /* * Intel ACPI functions * diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 3f6920dd7880..50ce94a0f31c 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: MIT */ #ifndef _INTEL_RINGBUFFER_H_ #define _INTEL_RINGBUFFER_H_
Commit b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") added default GPL-2.0 identifiers to i915 files without a license. For i915 the right choice would have been MIT. Fix it. Fixes: b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_trace.h | 2 +- drivers/gpu/drm/i915/i915_trace_points.c | 2 +- drivers/gpu/drm/i915/intel_acpi.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)