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-Url: https://git.stricted.de/?a=commitdiff_plain;h=6b7781b42dc9bc9bcd1523b6c24b876cdda0bef3;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.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 1da98e610e37,6b55d451ae7f..e945f8b07487
--- 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"