Messages in this thread | | | Date | Thu, 4 Oct 2012 11:54:17 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm tree with Linus' tree |
| |
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/gma500/psb_drv.h between commit 760285e7e7ab ("UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/") from Linus' tree and commit 4d46259f00c6 ("drm: gma500: Kill the GEM glue layer") from the drm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/gma500/psb_drv.h index b15282f,223ff5b..0000000 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h @@@ -23,11 -23,11 +23,11 @@@ #include <linux/kref.h> #include <drm/drmP.h> -#include "drm_global.h" -#include "gma_drm.h" +#include <drm/drm_global.h> - #include "gem_glue.h" +#include <drm/gma_drm.h> #include "psb_reg.h" #include "psb_intel_drv.h" + #include "intel_bios.h" #include "gtt.h" #include "power.h" #include "opregion.h" [unhandled content-type:application/pgp-signature] | |