xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into locking/core, to resolve conflicts

Browse Source 
Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2017-11-07 10:32:44 +01:00
parent ca5d376e17 e4880bc5df
commit 8c5db92a70
12937 changed files with 15821 additions and 2464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/radeon/Makefile
View File

@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the drm device driver. This driver provides support for the
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

1
drivers/gpu/drm/radeon/mkregtable.c
View File

@@ -1,3 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
/* utility to create the register check tables
* this includes inlined list.h safe for userspace.
*

1
drivers/gpu/drm/radeon/r100_track.h
View File

@@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */
#define R100_TRACK_MAX_TEXTURE 3
#define R200_TRACK_MAX_TEXTURE 6

1
drivers/gpu/drm/radeon/radeon_dp_mst.c
View File

@@ -1,3 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
#include <drm/drmP.h>
#include <drm/drm_dp_mst_helper.h>

1
drivers/gpu/drm/radeon/radeon_legacy_tv.c
View File

@@ -1,3 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include "radeon.h"

1
drivers/gpu/drm/radeon/radeon_trace.h
View File

@@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */
#if !defined(_RADEON_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
#define _RADEON_TRACE_H_

1
drivers/gpu/drm/radeon/radeon_trace_points.c
View File

@@ -1,3 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright Red Hat Inc 2010.
* Author : Dave Airlie <airlied@redhat.com>
*/