Skip to contentSkip to conversation

drm/gpuvm: Fix deprecated license identifier

PATCH In review Thomas Hellström 4 participants 4 messages Nov 6, 2023

Subsystems (3)
lore
Share & tools
lore

Thomas Hellström

author reviewer
#0 lore raw

PATCH 1/1 drm/gpuvm: Fix deprecated license identifier

"GPL-2.0-only" in the license header was incorrectly changed to the now deprecated "GPL-2.0". Fix.

---
 drivers/gpu/drm/drm_gpuvm.c | 2 +-
 include/drm/drm_gpuvm.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_gpuvm.c +1 -1
index 08c088319652..b80d4e1cc9b7 100644
@@ -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.
  *
include/drm/drm_gpuvm.h +1 -1
index bdfafc4a7705..c7a0594bdab1 100644
@@ -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__
Signature · 1 line
2.41.0
#1 lore raw

[Intel-xe] ✗ CI.Patch_applied: failure for drm/gpuvm: Fix deprecated license identifier

== Series Details ==

== 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".

Acked-by on v1 1/1
#3 lore raw
In reply to Thomas Hellström
Quoted 9 lines · Thomas Hellström

"GPL-2.0-only" in the license header was incorrectly changed to the now deprecated "GPL-2.0". Fix.

Quoted 28 lines
---
 drivers/gpu/drm/drm_gpuvm.c | 2 +-
 include/drm/drm_gpuvm.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_gpuvm.c +1 -1
index 08c088319652..b80d4e1cc9b7 100644
@@ -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.
  *
include/drm/drm_gpuvm.h +1 -1
index bdfafc4a7705..c7a0594bdab1 100644
@@ -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__
Signature · 1 line
2.41.0