linux-next: manual merge of the drm tree with Linus' tree

Stephen Rothwell
2012-11-30T01:22:27Z

[-- Attachment #1: Type: text/plain, Size: 990 bytes --]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c between commit
11d92561c81b ("drm/nvc0/disp: fix regression in vblank semaphore
release") from Linus' tree and commit 370c00f939c5 ("drm/nv50/disp:
initial implementation of the various channel object classes") 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/nouveau/core/engine/disp/nv50.c
index 15b182c,c6f8005..0000000
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
@@@ -22,7 -22,10 +22,11 @@@
* Authors: Ben Skeggs
*/

+ #include <core/object.h>
+ #include <core/parent.h>
+ #include <core/handle.h>
+ #include <core/class.h>
+#include <subdev/bar.h>

#include <engine/software.h>
#include <engine/disp.h>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]