From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Airlie <airlied@gmail.com>
Subject: Re: [GIT PULL] exynos-drm-fixes
Date: Thu, 13 Sep 2012 13:15:26 +1000
Message-ID: <CAPM=9ty0_a=M3JvO-NgfVd-Y87xmQtcsrhc2Aa2qu_+qmO0W+A@mail.gmail.com>
References: <1347255986-5742-1-git-send-email-inki.dae@samsung.com>
	<CAPM=9tyyktA8Y9jQutc=voSDwXO1vY7wUNtPgBhj2RUVQhUR7g@mail.gmail.com>
	<028e01cd9157$80d04ed0$8270ec70$%dae@samsung.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org>
Received: from mail-we0-f177.google.com (mail-we0-f177.google.com
	[74.125.82.177])
	by gabe.freedesktop.org (Postfix) with ESMTP id B31179E7A7
	for <dri-devel@lists.freedesktop.org>;
	Wed, 12 Sep 2012 20:15:27 -0700 (PDT)
Received: by weyr3 with SMTP id r3so1457558wey.36
	for <dri-devel@lists.freedesktop.org>;
	Wed, 12 Sep 2012 20:15:26 -0700 (PDT)
In-Reply-To: <028e01cd9157$80d04ed0$8270ec70$%dae@samsung.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
To: Inki Dae <inki.dae@samsung.com>
Cc: kyungmin.park@samsung.com, dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

>>
>> On Mon, Sep 10, 2012 at 3:46 PM, Inki Dae <inki.dae@samsung.com> wrote:
>> > Hello Dave, sorry for being late.
>> >
>> > this patch set fixes build warnings and includes minor code cleanup and
>> > also one patch you missed. this patch just drops non-standard NV12M and
>> > YUV420M formats from drm_fourcc.h
>> > for this, you can refer to below link:
>> >         http://lists.freedesktop.org/archives/dri-devel/2012-
>> April/021812.html
>> >
>> > other patches including big changes will go to -next.
>>
>> This appears to be built on a bad base commit, it might have been some a
>> fixes
>> tree that I had to revoke, can you rebase onto Linus master and resend?
>>
>
> Rebased. if there is any problem, please let me know.

commit da02680cb5ea7efd67732240fde739748149842e
Merge: df5c2b7 26df641
Author: Inki Dae <inki.dae@samsung.com>
Date:   Thu Sep 13 11:18:11 2012 +0900

    Merge branch 'drm-fixes' of ../main_line/linux-drm into dave-drm-fixes

shouldn't be there and is causing me problems, you shouldn't backmerge
without a reason in the merge commit, and even then it should be
avoided.

Dave.