Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next

Picking up drm-next @ 4.12-rc1 in order to apply Michal Hocko's vmalloc patch set

Signed-off-by: Sean Paul <seanpaul@chromium.org>

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/ci_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_virtual.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/soc15.c
index 1da98e610e3762e0938400386bef1ade5375446e,6b55d451ae7f94cd1c3342bc87f1cb37edac76e8..e945f8b074877bb561e2a9118ce5addf45b29155
--- 1/drivers/gpu/drm/amd/amdgpu/soc15.c
--- 2/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@@ -23,9 -23,9 +23,9 @@@
  #include <linux/firmware.h>
  #include <linux/slab.h>
  #include <linux/module.h>
 -#include "drmP.h"
 +#include <drm/drmP.h>
  #include "amdgpu.h"
- #include "amdgpu_atombios.h"
+ #include "amdgpu_atomfirmware.h"
  #include "amdgpu_ih.h"
  #include "amdgpu_uvd.h"
  #include "amdgpu_vce.h"

diff --cc drivers/gpu/drm/radeon/cik.c
Simple merge

diff --cc drivers/gpu/drm/sti/sti_compositor.c
Simple merge