Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_gem.c between commit
39b4d07aa3583ceefe73622841303a0a3e942ca1 ("drm: Hold the mutex when
dropping the last GEM reference (v2)") from Linus' tree and commit
fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b ("drm: kill
gem_free_object_unlocked driver callback") from the drm tree.

It looks like the former supercedes the latter, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/