From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?ISO-8859-1?Q?Christian_K=F6nig?= <deathsimple@vodafone.de>
Subject: Re: -next merged with Linus tree
Date: Fri, 20 Jul 2012 16:32:58 +0200
Message-ID: <50096C1A.8030202@vodafone.de>
References: <CAPM=9tzos9u0dHZvHANMktBtuRQ6HLsg4p38K3UGadPF=F3gxw@mail.gmail.com>
	<50091B3D.9030606@vodafone.de>
	<CAH3drwZOmcii4VgD0Z=8G7oqZzN-DeAtQtvob6PkssS=VF580Q@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"; Format="flowed"
Content-Transfer-Encoding: quoted-printable
Return-path: <dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org>
Received: from outgoing.email.vodafone.de (outgoing.email.vodafone.de
	[139.7.28.128])
	by gabe.freedesktop.org (Postfix) with ESMTP id 415459E801
	for <dri-devel@lists.freedesktop.org>;
	Fri, 20 Jul 2012 07:33:00 -0700 (PDT)
In-Reply-To: <CAH3drwZOmcii4VgD0Z=8G7oqZzN-DeAtQtvob6PkssS=VF580Q@mail.gmail.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: Jerome Glisse <j.glisse@gmail.com>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
List-Id: dri-devel@lists.freedesktop.org

On 20.07.2012 16:12, Jerome Glisse wrote:
> On Fri, Jul 20, 2012 at 4:47 AM, Christian K=F6nig
> <deathsimple@vodafone.de> wrote:
>> On 20.07.2012 07:34, Dave Airlie wrote:
>>> Hi,
>>>
>>> I've just merged Linus tree into drm-next and fixes up the conflicts,
>>> some in i915, one in radeon.
>>>
>>> Can you guys check that they look correct after it?
>> Have to test it a bit more, but at least
>> drivers/gpu/drm/radeon/radeon_gart.c looks valid to me on first glance.
>>
>> Christian.
>>
>>
>>> I'll leave it just on my drm-next branch for now.
>>>
>>> Thanks,
>>> Dave.
> Attached patch fix something that have been lost.
Ups, yes indeed. The patch itself is:

Reviewed-by: Christian K=F6nig <christian.koenig@amd.com>

>
> Cheers,
> Jerome