[PATCH v5 09/12] drm/exynos: remove exported functions from exynos_drm_plane

[Tobias Jakobi]

Gustavo Padovan wrote:
> 2015-05-21 Gustavo Padovan <gustavo.padovan at collabora.co.uk>:
> 
>> 2015-05-21 Tobias Jakobi <tjakobi at math.uni-bielefeld.de>:
>>
>>> Hi,
>>>
>>> like I said before, this clashes with my commit 'drm/exynos: plane: honor
>>> buffer offset for dma_addr' (5d878bdb51bd7915ba3def8b531238c67624aa58),
>>> which is currently sitting in airlied's drm-fixes.
>>
>> Inki has to merge his -fixes tree into exynos-drm-next to solve this.
>> It is the only way I can rebase on top of your commit and solve the
>> conflict.
>> Anyway, I just figured that exynos-drm-next was updated from yesterday
>> to today so this v5 doesn't apply on today's tree. I'll send a v6 once
>> Inki merges "drm/exynos: plane: honor buffer offset for dma_addr" into
>> exynos-drm-next.
>>
>> Inki, can you please do that? so we can proceed with atomic and
>> hopefully have it ready for 4.2 merge window.
> 
> Actually the patch is on exynos-drm-next but with a different commit id.
> I wonder why. Why did you applied it directly to your branch instead of
> merging the -fixes tree? Now we have the same commit with the differents
> hashes in the tree.
I never do merges for my tree, I always rebase (either on stable/linux
or torvalds/master). For submitting patches I cherry-pick stuff to the
corresponding upstream branch (exynos-drm-next in this case) and then
submit via git-send-email.

With best wishes,
Tobias

> 
> 	Gustavo
>