Messages in this thread | | | Subject | Re: linux-next: manual merge of the drm-misc tree with Linus' tree | From | Thomas Hellstrom <> | Date | Mon, 14 Dec 2015 08:09:23 +0100 |
| |
On 12/14/2015 02:12 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got conflicts in: > > drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > between commit: > > 8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2") > > from Linus' tree and commit: > > f80de66eca65 ("drm/vmwgfx: Drop dummy save/restore hooks") > > from the drm-misc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > FWIW, the fix looks correct to me.
/Thomas
| |