* [Intel-xe] [PATCH] drm/gpuvm: Fix deprecated license identifier
@ 2023-11-06 11:48 ` Thomas Hellström
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Hellström @ 2023-11-06 11:48 UTC (permalink / raw)
To: dri-devel, intel-xe; +Cc: Danilo Krummrich, David Edelsohn, Maxime Ripard
"GPL-2.0-only" in the license header was incorrectly changed to the
now deprecated "GPL-2.0". Fix.
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Danilo Krummrich <dakr@redhat.com>
Reported-by: David Edelsohn <dje.gcc@gmail.com>
Closes: https://lore.kernel.org/dri-devel/5lfrhdpkwhpgzipgngojs3tyqfqbesifzu5nf4l5q3nhfdhcf2@25nmiq7tfrew/T/#m5c356d68815711eea30dd94cc6f7ea8cd4344fe3
Fixes: f7749a549b4f ("drm/gpuvm: Dual-licence the drm_gpuvm code GPL-2.0 OR MIT")
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/drm_gpuvm.c | 2 +-
include/drm/drm_gpuvm.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c
index 08c088319652..b80d4e1cc9b7 100644
--- a/drivers/gpu/drm/drm_gpuvm.c
+++ b/drivers/gpu/drm/drm_gpuvm.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR MIT
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2022 Red Hat.
*
diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h
index bdfafc4a7705..c7a0594bdab1 100644
--- a/include/drm/drm_gpuvm.h
+++ b/include/drm/drm_gpuvm.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* SPDX-License-Identifier: GPL-2.0-only OR MIT */
#ifndef __DRM_GPUVM_H__
#define __DRM_GPUVM_H__
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] drm/gpuvm: Fix deprecated license identifier
@ 2023-11-06 11:48 ` Thomas Hellström
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Hellström @ 2023-11-06 11:48 UTC (permalink / raw)
To: dri-devel, intel-xe
Cc: Thomas Hellström, Danilo Krummrich, David Edelsohn,
Maxime Ripard
"GPL-2.0-only" in the license header was incorrectly changed to the
now deprecated "GPL-2.0". Fix.
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Danilo Krummrich <dakr@redhat.com>
Reported-by: David Edelsohn <dje.gcc@gmail.com>
Closes: https://lore.kernel.org/dri-devel/5lfrhdpkwhpgzipgngojs3tyqfqbesifzu5nf4l5q3nhfdhcf2@25nmiq7tfrew/T/#m5c356d68815711eea30dd94cc6f7ea8cd4344fe3
Fixes: f7749a549b4f ("drm/gpuvm: Dual-licence the drm_gpuvm code GPL-2.0 OR MIT")
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/drm_gpuvm.c | 2 +-
include/drm/drm_gpuvm.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c
index 08c088319652..b80d4e1cc9b7 100644
--- a/drivers/gpu/drm/drm_gpuvm.c
+++ b/drivers/gpu/drm/drm_gpuvm.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR MIT
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2022 Red Hat.
*
diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h
index bdfafc4a7705..c7a0594bdab1 100644
--- a/include/drm/drm_gpuvm.h
+++ b/include/drm/drm_gpuvm.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/* SPDX-License-Identifier: GPL-2.0-only OR MIT */
#ifndef __DRM_GPUVM_H__
#define __DRM_GPUVM_H__
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Intel-xe] ✗ CI.Patch_applied: failure for drm/gpuvm: Fix deprecated license identifier
2023-11-06 11:48 ` Thomas Hellström
(?)
@ 2023-11-06 12:12 ` Patchwork
-1 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2023-11-06 12:12 UTC (permalink / raw)
To: Thomas Hellström; +Cc: intel-xe
== Series Details ==
Series: drm/gpuvm: Fix deprecated license identifier
URL : https://patchwork.freedesktop.org/series/126021/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-xe-next' with base: ===
Base commit: fc457bcc1 Revert "FIXME: drm/i915/crtc: use irqsave for locking event_lock"
=== git am output follows ===
error: patch failed: drivers/gpu/drm/drm_gpuvm.c:1
error: drivers/gpu/drm/drm_gpuvm.c: patch does not apply
error: patch failed: include/drm/drm_gpuvm.h:1
error: include/drm/drm_gpuvm.h: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: drm/gpuvm: Fix deprecated license identifier
Patch failed at 0001 drm/gpuvm: Fix deprecated license identifier
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-xe] [PATCH] drm/gpuvm: Fix deprecated license identifier
2023-11-06 11:48 ` Thomas Hellström
@ 2023-11-06 13:21 ` Maxime Ripard
-1 siblings, 0 replies; 7+ messages in thread
From: Maxime Ripard @ 2023-11-06 13:21 UTC (permalink / raw)
To: Thomas Hellström
Cc: Maxime Ripard, David Edelsohn, Danilo Krummrich, intel-xe,
dri-devel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 336 bytes --]
On Mon, 6 Nov 2023 12:48:27 +0100, Thomas Hellström wrote:
> "GPL-2.0-only" in the license header was incorrectly changed to the
> now deprecated "GPL-2.0". Fix.
>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Danilo Krummrich <dakr@redhat.com>
>
> [ ... ]
Acked-by: Maxime Ripard <mripard@kernel.org>
Thanks!
Maxime
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-xe] [PATCH] drm/gpuvm: Fix deprecated license identifier
2023-11-06 11:48 ` Thomas Hellström
@ 2023-11-06 13:25 ` Danilo Krummrich
-1 siblings, 0 replies; 7+ messages in thread
From: Danilo Krummrich @ 2023-11-06 13:25 UTC (permalink / raw)
To: Thomas Hellström; +Cc: Maxime Ripard, David Edelsohn, intel-xe, dri-devel
On Mon, Nov 06, 2023 at 12:48:27PM +0100, Thomas Hellström wrote:
> "GPL-2.0-only" in the license header was incorrectly changed to the
> now deprecated "GPL-2.0". Fix.
>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Danilo Krummrich <dakr@redhat.com>
> Reported-by: David Edelsohn <dje.gcc@gmail.com>
> Closes: https://lore.kernel.org/dri-devel/5lfrhdpkwhpgzipgngojs3tyqfqbesifzu5nf4l5q3nhfdhcf2@25nmiq7tfrew/T/#m5c356d68815711eea30dd94cc6f7ea8cd4344fe3
> Fixes: f7749a549b4f ("drm/gpuvm: Dual-licence the drm_gpuvm code GPL-2.0 OR MIT")
> Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: Danilo Krummrich <dakr@redhat.com>
> ---
> drivers/gpu/drm/drm_gpuvm.c | 2 +-
> include/drm/drm_gpuvm.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c
> index 08c088319652..b80d4e1cc9b7 100644
> --- a/drivers/gpu/drm/drm_gpuvm.c
> +++ b/drivers/gpu/drm/drm_gpuvm.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0 OR MIT
> +// SPDX-License-Identifier: GPL-2.0-only OR MIT
> /*
> * Copyright (c) 2022 Red Hat.
> *
> diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h
> index bdfafc4a7705..c7a0594bdab1 100644
> --- a/include/drm/drm_gpuvm.h
> +++ b/include/drm/drm_gpuvm.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 OR MIT */
> +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */
>
> #ifndef __DRM_GPUVM_H__
> #define __DRM_GPUVM_H__
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/gpuvm: Fix deprecated license identifier
@ 2023-11-06 13:25 ` Danilo Krummrich
0 siblings, 0 replies; 7+ messages in thread
From: Danilo Krummrich @ 2023-11-06 13:25 UTC (permalink / raw)
To: Thomas Hellström; +Cc: Maxime Ripard, David Edelsohn, intel-xe, dri-devel
On Mon, Nov 06, 2023 at 12:48:27PM +0100, Thomas Hellström wrote:
> "GPL-2.0-only" in the license header was incorrectly changed to the
> now deprecated "GPL-2.0". Fix.
>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Danilo Krummrich <dakr@redhat.com>
> Reported-by: David Edelsohn <dje.gcc@gmail.com>
> Closes: https://lore.kernel.org/dri-devel/5lfrhdpkwhpgzipgngojs3tyqfqbesifzu5nf4l5q3nhfdhcf2@25nmiq7tfrew/T/#m5c356d68815711eea30dd94cc6f7ea8cd4344fe3
> Fixes: f7749a549b4f ("drm/gpuvm: Dual-licence the drm_gpuvm code GPL-2.0 OR MIT")
> Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: Danilo Krummrich <dakr@redhat.com>
> ---
> drivers/gpu/drm/drm_gpuvm.c | 2 +-
> include/drm/drm_gpuvm.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c
> index 08c088319652..b80d4e1cc9b7 100644
> --- a/drivers/gpu/drm/drm_gpuvm.c
> +++ b/drivers/gpu/drm/drm_gpuvm.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0 OR MIT
> +// SPDX-License-Identifier: GPL-2.0-only OR MIT
> /*
> * Copyright (c) 2022 Red Hat.
> *
> diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h
> index bdfafc4a7705..c7a0594bdab1 100644
> --- a/include/drm/drm_gpuvm.h
> +++ b/include/drm/drm_gpuvm.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 OR MIT */
> +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */
>
> #ifndef __DRM_GPUVM_H__
> #define __DRM_GPUVM_H__
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-11-06 13:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-06 11:48 [Intel-xe] [PATCH] drm/gpuvm: Fix deprecated license identifier Thomas Hellström
2023-11-06 11:48 ` Thomas Hellström
2023-11-06 12:12 ` [Intel-xe] ✗ CI.Patch_applied: failure for " Patchwork
2023-11-06 13:21 ` [Intel-xe] [PATCH] " Maxime Ripard
2023-11-06 13:21 ` Maxime Ripard
2023-11-06 13:25 ` [Intel-xe] " Danilo Krummrich
2023-11-06 13:25 ` Danilo Krummrich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.