Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/nouveau/nouveau_drv.h between commit
952eb63543552deb1bf1113739d59d29172d7755 ("drm/nouveau: remove some
unused members from drm_nouveau_private") from Linus' tree and commit
386516744ba45d50f42c6999151cc210cb4f96e4 ("drm/fb: fix fbdev object model
+ cleanup properly") from the drm tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/gpu/drm/nouveau/nouveau_drv.h
index ace630a,941339c..0000000
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@@ -533,8 -531,7 +533,6 @@@ struct drm_nouveau_private
atomic_t validate_sequence;
} ttm;
- struct fb_info *fbdev_info;
-
- int fifo_alloc_count;
struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR];
struct nouveau_engine engine;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
