Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/nouveau (lots of files) between commit 760285e7e7ab
("UAPI: (Scripted) Convert #include "..." to #include <path/...> in
drivers/gpu/") from Linus' tree and various commits from the drm tree.
There is a large reorganisation under drivers/gpu/nouveau in the drm
tree (which only appeared in linux-next today :-().
I used the drm tree versions of the files and but this needs to be done
properly.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp7kXSIxcIsu.pgp
Description: PGP signature
