* linux-next: rebase of the drm-exynos tree
@ 2015-08-17 22:50 Stephen Rothwell
2015-08-18 1:21 ` Inki Dae
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2015-08-17 22:50 UTC (permalink / raw)
To: Inki Dae; +Cc: linux-next, linux-kernel, Dave Airlie
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 sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: rebase of the drm-exynos tree
2015-08-17 22:50 linux-next: rebase of the drm-exynos tree Stephen Rothwell
@ 2015-08-18 1:21 ` Inki Dae
0 siblings, 0 replies; 2+ messages in thread
From: Inki Dae @ 2015-08-18 1:21 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dave Airlie
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-18 1:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-17 22:50 linux-next: rebase of the drm-exynos tree Stephen Rothwell
2015-08-18 1:21 ` Inki Dae
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).