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

From	Thomas Hellstrom <thellstrom@vmware.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the drm-misc tree with Linus' tree
Date	2015-12-14 08:10 +0100
Message-ID	<qFvqF-2Qk-1@gated-at.bofh.it> (permalink)
References	<qFpXX-7BZ-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the drm-misc tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-14 02:20 +0100
  Re: linux-next: manual merge of the drm-misc tree with Linus' tree Thomas Hellstrom <thellstrom@vmware.com> - 2015-12-14 08:10 +0100

csiph-web