On Fri, Jul 20, 2012 at 10:32 AM, Christian König <deathsimple@xxxxxxxxxxx> wrote: > On 20.07.2012 16:12, Jerome Glisse wrote: >> >> On Fri, Jul 20, 2012 at 4:47 AM, Christian König >> <deathsimple@xxxxxxxxxxx> 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önig <christian.koenig@xxxxxxx> > Btw i am still reading code btw build, but so far so good beside my patch. Cheers, Jerome _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
