-next merged with Linus tree

2012-07-20 Thread Christian König
On 20.07.2012 16:12, Jerome Glisse wrote: > On Fri, Jul 20, 2012 at 4:47 AM, Christian K?nig > 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 th

-next merged with Linus tree

2012-07-20 Thread Dave Airlie
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? I'll leave it just on my drm-next branch for now. Thanks, Dave.

-next merged with Linus tree

2012-07-20 Thread Jerome Glisse
On Fri, Jul 20, 2012 at 10:32 AM, Christian K?nig wrote: > On 20.07.2012 16:12, Jerome Glisse wrote: >> >> On Fri, Jul 20, 2012 at 4:47 AM, Christian K?nig >> wrote: >>> >>> On 20.07.2012 07:34, Dave Airlie wrote: Hi, I've just merged Linus tree into drm-next and fixes up the

-next merged with Linus tree

2012-07-20 Thread Christian König
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 t

-next merged with Linus tree

2012-07-20 Thread Jerome Glisse
On Fri, Jul 20, 2012 at 4:47 AM, Christian K?nig 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 bi

Re: -next merged with Linus tree

2012-07-20 Thread Jerome Glisse
On Fri, Jul 20, 2012 at 10:32 AM, Christian König wrote: > On 20.07.2012 16:12, Jerome Glisse wrote: >> >> On Fri, Jul 20, 2012 at 4:47 AM, Christian König >> wrote: >>> >>> On 20.07.2012 07:34, Dave Airlie wrote: Hi, I've just merged Linus tree into drm-next and fixes up the

Re: -next merged with Linus tree

2012-07-20 Thread Christian König
On 20.07.2012 16:12, Jerome Glisse wrote: On Fri, Jul 20, 2012 at 4:47 AM, Christian König 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?

Re: -next merged with Linus tree

2012-07-20 Thread Jerome Glisse
On Fri, Jul 20, 2012 at 4:47 AM, Christian König 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 bi

Re: -next merged with Linus tree

2012-07-20 Thread Christian König
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

-next merged with Linus tree

2012-07-19 Thread Dave Airlie
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? I'll leave it just on my drm-next branch for now. Thanks, Dave. ___ dri-devel mailing list dri-d