From: Dave Airlie Date: Fri, 11 Dec 2015 03:46:05 +0000 (+1000) Subject: Merge branch 'drm-header-fixes' of https://github.com/GabrielL/linux into drm-next X-Git-Tag: v5.15~14379^2~34 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=663a233eef643b38f36c05535cb5c9a4972edcc1;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'drm-header-fixes' of https://github.com/GabrielL/linux into drm-next Fix all the problems with the header files and userspace builds off them. I really care so little about this, but hey who am I to stop progress. * 'drm-header-fixes' of https://github.com/GabrielL/linux: (30 commits) drm: fix inclusion of drm.h in via_drm.h drm: fix inclusion of drm.h in vmwgfx_drm.h drm: fix inclusion of drm.h in virtgpu_drm.h drm: fix inclusion of drm.h in tegra_drm.h drm: fix inclusion of drm.h in savage_drm.h drm: fix inclusion of drm.h in r128_drm.h drm: fix inclusion of drm.h in qxl_drm.h drm: fix inclusion of drm.h in omap_drm.h drm: fix inclusion of drm.h in msm_drm.h drm: fix inclusion of drm.h in mga_drm.h drm: fix inclusion of drm.h in exynos_sarea.h drm: fix inclusion of drm.h in i810_drm.h drm: fix inclusion of drm.h in exynos_sarea.h drm: fix inclusion of drm.h in drm_sarea.h drm: drm_mode.h fix includes drm: drm_fourcc.h fix includes drm: include drm.h in armada_drm.h include/uapi/drm/amdgpu_drm.h: use __u32 and __u64 from drm: Kbuild: add admgpu_drm.h to the installed headers drm: use __u{32,64} instead of uint{32,64}_t in virtgpu_drm.h ... --- 663a233eef643b38f36c05535cb5c9a4972edcc1