MIME-version: 1.0
Content-type: text/plain; charset=UTF-8
Content-transfer-encoding: 8BIT
Message-id: <55D2889C.20404@samsung.com>
Date: Tue, 18 Aug 2015 10:21:32 +0900
From: Inki Dae <inki.dae@samsung.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101
 Thunderbird/31.7.0
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Dave Airlie <airlied@linux.ie>
Subject: Re: linux-next: rebase of the drm-exynos tree
References: <20150818085050.7a38f4ef@canb.auug.org.au>
In-reply-to: <20150818085050.7a38f4ef@canb.auug.org.au>
DLP-Filter: Pass
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 966
Lines: 26

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/