2015-08-17 22:50:57

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: rebase of the drm-exynos tree

Hi Inki,

I noticed today that your tree
(git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next)
has been merged by Dave into his drm tree. Unfortunately, your tree
has also been rebased onto Linus's v4.2-rc7. So now the commits
0cb600d9be30-f8f66412fa6c in your tree are duplicated of commits
d36b3004ca2c-2a8cb4894540 in Dave's. Please tidy this up (i.e. your
exynos-drm/for-next branch should be commit 2a8cb4894540 or something
later in Dave's tree) and you should continue your work from there.

--
Cheers,
Stephen Rothwell [email protected]


Subject: Re: linux-next: rebase of the drm-exynos tree

Hi Stephen,

On 2015년 08월 18일 07:50, Stephen Rothwell wrote:
> Hi Inki,
>
> I noticed today that your tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next)
> has been merged by Dave into his drm tree. Unfortunately, your tree
> has also been rebased onto Linus's v4.2-rc7. So now the commits
> 0cb600d9be30-f8f66412fa6c in your tree are duplicated of commits
> d36b3004ca2c-2a8cb4894540 in Dave's. Please tidy this up (i.e. your
> exynos-drm/for-next branch should be commit 2a8cb4894540 or something
> later in Dave's tree) and you should continue your work from there.

Right, I had requested git-pull. Will do re-base on top of Dave's tree.

Thanks,
Inki Dae

>