Commit d586d571 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-02-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



drm-misc-fixes for v5.0:
- Fix license inconsistency in vkms.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/812e2f53-d72a-8fba-6c8c-fde8f44cf141@linux.intel.com
parents cd4c5a48 7fd56e02

drivers/gpu/drm/vkms/vkms_crc.c

+2 −1
Original line number Diff line number Diff line 
// 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>

drivers/gpu/drm/vkms/vkms_crtc.c

+1 −7
Original line number Diff line number Diff line 
// 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>

drivers/gpu/drm/vkms/vkms_drv.c

+1 −6
Original line number Diff line number Diff line 
/*

 * 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)

drivers/gpu/drm/vkms/vkms_drv.h

+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */



#ifndef _VKMS_DRV_H_

#define _VKMS_DRV_H_

drivers/gpu/drm/vkms/vkms_gem.c

+1 −7
Original line number Diff line number Diff line 
// 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>