[GIT PULL] omapdrm changes for v4.5

[Tomi Valkeinen]

Hi Dave,

On 18/12/15 11:16, Tomi Valkeinen wrote:
> Hi Dave,
> 
> Please pull omapdrm changes for v4.5.
> 
>  Tomi
> 
> The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e27864353c89:
> 
>   Linux 4.4-rc5 (2015-12-13 17:42:58 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/omapdrm-4.5
> 
> for you to fetch changes up to 49d274e110d185dbbacabc601b55fd7b9b0e91d6:
> 
>   drm/omap: remove obsolete manager assignment (2015-12-18 11:08:20 +0200)

I see there's a conflict with my tag and drm-next.

Commit 07a6dc19a36912a1bea7ce1d5856c5616c30839a ("drm/omap: use kzalloc
in sita_init()") in drm-next makes a change to tcm-sita.c, which was
pretty much re-written in my branch. I hadn't noticed that patch on the
list.

The conflict looks a bit messy, but can be resolved easily by just
taking tcm-sita.c from my tag, as the change in 07a6dc19a36912a is no
longer needed.

So you can just do:

git merge -s recursive -X theirs omapdrm-4.5

Or you can merge a new tag I made 'omapdrm-4.5-resolved' which has the
same patches, rebased (with -s recursive -X theirs) on top of drm-next.

 Tomi

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20151231/b1eafd96/attachment-0001.sig>