2024-04-10 08:22:30

by Krzysztof Kozlowski

Subject: [PATCH RESEND] drm: use capital "OR" for multiple licenses in SPDX

Documentation/process/license-rules.rst expects the SPDX identifier
syntax for multiple licenses to use capital "OR". Correct it to keep
consistent format and avoid copy-paste issues.

Signed-off-by: Krzysztof Kozlowski <[email protected]>

---

Resend...

Cc: Dmitry Baryshkov <[email protected]>
Cc: Neil Armstrong <[email protected]>
---
drivers/gpu/drm/drm_client.c | 2 +-
drivers/gpu/drm/drm_format_helper.c | 2 +-
include/drm/drm_client.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
index 77fe217aeaf3..d8e3427ae205 100644
--- a/drivers/gpu/drm/drm_client.c
+++ b/drivers/gpu/drm/drm_client.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 or MIT
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright 2018 Noralf Trønnes
*/
diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
index b1be458ed4dd..2348135fb6c0 100644
--- a/drivers/gpu/drm/drm_format_helper.c
+++ b/drivers/gpu/drm/drm_format_helper.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 or MIT
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2016 Noralf Trønnes
*
diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h
index bc0e66f9c425..1b907709115e 100644
--- a/include/drm/drm_client.h
+++ b/include/drm/drm_client.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 or MIT */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */

#ifndef _DRM_CLIENT_H_
#define _DRM_CLIENT_H_
--
2.34.1

2024-04-10 09:08:44

by Neil Armstrong

Subject: Re: [PATCH RESEND] drm: use capital "OR" for multiple licenses in SPDX

On 10/04/2024 10:22, Krzysztof Kozlowski wrote:
> Documentation/process/license-rules.rst expects the SPDX identifier
> syntax for multiple licenses to use capital "OR". Correct it to keep
> consistent format and avoid copy-paste issues.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
> ---
>
> Resend...
>
> Cc: Dmitry Baryshkov <[email protected]>
> Cc: Neil Armstrong <[email protected]>
> ---
> drivers/gpu/drm/drm_client.c | 2 +-
> drivers/gpu/drm/drm_format_helper.c | 2 +-
> include/drm/drm_client.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
> index 77fe217aeaf3..d8e3427ae205 100644
> --- a/drivers/gpu/drm/drm_client.c
> +++ b/drivers/gpu/drm/drm_client.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0 or MIT
> +// SPDX-License-Identifier: GPL-2.0 OR MIT
> /*
> * Copyright 2018 Noralf Trønnes
> */
> diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
> index b1be458ed4dd..2348135fb6c0 100644
> --- a/drivers/gpu/drm/drm_format_helper.c
> +++ b/drivers/gpu/drm/drm_format_helper.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0 or MIT
> +// SPDX-License-Identifier: GPL-2.0 OR MIT
> /*
> * Copyright (C) 2016 Noralf Trønnes
> *
> diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h
> index bc0e66f9c425..1b907709115e 100644
> --- a/include/drm/drm_client.h
> +++ b/include/drm/drm_client.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 or MIT */
> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */
>
> #ifndef _DRM_CLIENT_H_
> #define _DRM_CLIENT_H_

Reviewed-by: Neil Armstrong <[email protected]>

I think we'll need maxime or thomas ack to apply this via drm-misc-next

Neil