lkml.org 
[lkml]   [2019]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH V2] drm/vkms: Fix license inconsistent
On Wed, Feb 06, 2019 at 12:01:16PM -0200, Rodrigo Siqueira wrote:
> Fixes license inconsistent related to the VKMS driver and remove the
> redundant boilerplate comment.
>
> Fixes: 854502fa0a38 ("drm/vkms: Add basic CRTC initialization")
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
> ---
> Changes in V2:
> - Add "Cc: stable@vger.kernel.org" tag

Since cc: stable please apply this patch to drm-misc-fixes, not
drm-misc-next like usual.

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> drivers/gpu/drm/vkms/vkms_crc.c | 3 ++-
> drivers/gpu/drm/vkms/vkms_crtc.c | 8 +-------
> drivers/gpu/drm/vkms/vkms_drv.c | 7 +------
> drivers/gpu/drm/vkms/vkms_drv.h | 2 ++
> drivers/gpu/drm/vkms/vkms_gem.c | 8 +-------
> drivers/gpu/drm/vkms/vkms_output.c | 8 +-------
> drivers/gpu/drm/vkms/vkms_plane.c | 8 +-------
> 7 files changed, 9 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c
> index 9d9e8146db90..d7b409a3c0f8 100644
> --- a/drivers/gpu/drm/vkms/vkms_crc.c
> +++ b/drivers/gpu/drm/vkms/vkms_crc.c
> @@ -1,4 +1,5 @@
> -// SPDX-License-Identifier: GPL-2.0
> +// SPDX-License-Identifier: GPL-2.0+
> +
> #include "vkms_drv.h"
> #include <linux/crc32.h>
> #include <drm/drm_atomic.h>
> diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
> index 5a095610726b..6ddaa1610807 100644
> --- a/drivers/gpu/drm/vkms/vkms_crtc.c
> +++ b/drivers/gpu/drm/vkms/vkms_crtc.c
> @@ -1,10 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - */
> +// SPDX-License-Identifier: GPL-2.0+
>
> #include "vkms_drv.h"
> #include <drm/drm_atomic_helper.h>
> diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
> index b13f99a5c849..738dd6206d85 100644
> --- a/drivers/gpu/drm/vkms/vkms_drv.c
> +++ b/drivers/gpu/drm/vkms/vkms_drv.c
> @@ -1,9 +1,4 @@
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - */
> +// SPDX-License-Identifier: GPL-2.0+
>
> /**
> * DOC: vkms (Virtual Kernel Modesetting)
> diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
> index e4469cd3d254..81f1cfbeb936 100644
> --- a/drivers/gpu/drm/vkms/vkms_drv.h
> +++ b/drivers/gpu/drm/vkms/vkms_drv.h
> @@ -1,3 +1,5 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +
> #ifndef _VKMS_DRV_H_
> #define _VKMS_DRV_H_
>
> diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c
> index 80311daed47a..138b0bb325cf 100644
> --- a/drivers/gpu/drm/vkms/vkms_gem.c
> +++ b/drivers/gpu/drm/vkms/vkms_gem.c
> @@ -1,10 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - */
> +// SPDX-License-Identifier: GPL-2.0+
>
> #include <linux/shmem_fs.h>
>
> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> index c5b16efed51a..3b162b25312e 100644
> --- a/drivers/gpu/drm/vkms/vkms_output.c
> +++ b/drivers/gpu/drm/vkms/vkms_output.c
> @@ -1,10 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - */
> +// SPDX-License-Identifier: GPL-2.0+
>
> #include "vkms_drv.h"
> #include <drm/drm_atomic_helper.h>
> diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c
> index 418817600ad1..0e67d2d42f0c 100644
> --- a/drivers/gpu/drm/vkms/vkms_plane.c
> +++ b/drivers/gpu/drm/vkms/vkms_plane.c
> @@ -1,10 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - */
> +// SPDX-License-Identifier: GPL-2.0+
>
> #include "vkms_drv.h"
> #include <drm/drm_plane_helper.h>
> --
> 2.20.1
>
>
> --
> Rodrigo Siqueira
> https://siqueira.tech
> Graduate Student
> Department of Computer Science
> University of São Paulo



--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

\
 
 \ /
  Last update: 2019-02-06 16:29    [W:0.403 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site