From: Sean Paul <seanpaul@chromium.org>
Date: Thu, 18 May 2017 13:24:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
X-Git-Tag: v4.14-rc1~8^2~52^2~258
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b7781b42dc9bc9bcd1523b6c24b876cdda0bef3;p=platform%2Fkernel%2Flinux-rpi.git

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

6b7781b42dc9bc9bcd1523b6c24b876cdda0bef3
diff --cc drivers/gpu/drm/amd/amdgpu/soc15.c
index 1da98e6,6b55d45..e945f8b
--- a/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"