Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/nouveau/nouveau_sgdma.c between commit a10e9e1dbb39
("drm/nouveau: fix oopses caused by clear being called on unpopulated
ttms") from Linus' tree and commit 649bf3ca7734 ("drm/ttm: merge
ttm_backend and ttm_tt V5") from the drm tree.
I have no idea how to fix this up, so I just used the version from the
drm tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpLeHQ_wDj3W.pgp
Description: PGP signature
