| From 7fd56e0260a22c0cfaf9adb94a2427b76e239dd0 Mon Sep 17 00:00:00 2001 |
| From: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com> |
| Date: Wed, 6 Feb 2019 12:01:16 -0200 |
| Subject: drm/vkms: Fix license inconsistent |
| |
| From: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com> |
| |
| commit 7fd56e0260a22c0cfaf9adb94a2427b76e239dd0 upstream. |
| |
| 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> |
| Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20190206140116.7qvy2lpwbcd7wds6@smtp.gmail.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| 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 +------- |
| 6 files changed, 7 insertions(+), 34 deletions(-) |
| |
| --- 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> |
| --- 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+ |
| |
| #include <linux/module.h> |
| #include <drm/drm_gem.h> |
| --- 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_ |
| |
| --- 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> |
| |
| --- 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_crtc_helper.h> |
| --- 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> |
