From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Christian_K=F6nig?= Subject: Re: -next merged with Linus tree Date: Fri, 20 Jul 2012 10:47:57 +0200 Message-ID: <50091B3D.9030606@vodafone.de> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from outgoing.email.vodafone.de (outgoing.email.vodafone.de [139.7.28.128]) by gabe.freedesktop.org (Postfix) with ESMTP id 86B629EC90 for ; Fri, 20 Jul 2012 01:48:01 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Dave Airlie Cc: dri-devel List-Id: dri-devel@lists.freedesktop.org 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. > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >