Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1208934 > unrolled thread

linux-next: rebase of the drm-exynos tree

Back to article view | Back to linux.kernel

Contents

  linux-next: rebase of the drm-exynos tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-18 01:00 +0200
    Re: linux-next: rebase of the drm-exynos tree Inki Dae <inki.dae@samsung.com> - 2015-08-18 03:30 +0200

#1208934 — 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                    sfr@canb.auug.org.au
--
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/

[toc] | [next] | [standalone]

#1208991

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

> 

--
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/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web