Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-18 Thread Alan Hourihane
On Sun, Apr 18, 2004 at 01:33:41PM +0200, Michel Dänzer wrote: > On Sun, 2004-04-18 at 04:19, Donnie Berkholz wrote: > > On Sat, 2004-04-17 at 07:54, Alan Hourihane wrote: > > > On Sat, Apr 17, 2004 at 01:18:49AM +0200, Michel Dänzer wrote: > > > > On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote:

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-18 Thread Michel Dänzer
On Sun, 2004-04-18 at 04:19, Donnie Berkholz wrote: > On Sat, 2004-04-17 at 07:54, Alan Hourihane wrote: > > On Sat, Apr 17, 2004 at 01:18:49AM +0200, Michel DÃnzer wrote: > > > On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: > > > > > > > > I could merge in XFree86 4.3.99.902 which is before t

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-17 Thread Donnie Berkholz
On Sat, 2004-04-17 at 07:54, Alan Hourihane wrote: > On Sat, Apr 17, 2004 at 01:18:49AM +0200, Michel Dänzer wrote: > > On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: > > > > > > I could merge in XFree86 4.3.99.902 which is before the license change > > > > Are you sure? AFAIK David applied t

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-17 Thread Alan Hourihane
On Sat, Apr 17, 2004 at 01:18:49AM +0200, Michel Dänzer wrote: > On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: > > > > I could merge in XFree86 4.3.99.902 which is before the license change > > Are you sure? AFAIK David applied the new license (or at least a > similarly controversial one) to

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-16 Thread Dave Airlie
> AFAIK X.org also imported 4.3.99.902 for their version (at least the release > notes indicates that 4.3.99.902 was merged unconditionally, > http://freedesktop.org/cgi-bin/viewcvs.cgi/xc/RELNOTES?root=xorg), so if > indeed some files would be covered under the new license even for this version >

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-16 Thread Roland Scheidegger
Michel DÃnzer wrote: On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: I could merge in XFree86 4.3.99.902 which is before the license change Are you sure? AFAIK David applied the new license (or at least a similarly controversial one) to some files before it was publicly announced. This page

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-16 Thread Michel Dänzer
On Sat, 2004-04-17 at 00:00, Alan Hourihane wrote: > > I could merge in XFree86 4.3.99.902 which is before the license change Are you sure? AFAIK David applied the new license (or at least a similarly controversial one) to some files before it was publicly announced. > and closer to what X.Org w

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-16 Thread Ian Romanick
Alan Hourihane wrote: I could merge in XFree86 4.3.99.902 which is before the license change and closer to what X.Org went with for now. That will bring us closer to both trees. And then we can delay a decision until things have settled on both sides of the pond, and see where the land lies. What

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-16 Thread Mike Mestnik
I was under the impresion that several bugs where found in 4.3.99.902 that need patching. This work has allready been done twice I shuder to think any one would bother a third. --- Alan Hourihane <[EMAIL PROTECTED]> wrote: > On Thu, Apr 15, 2004 at 08:13:53AM -0700, Alex Deucher wrote: > > Speaki

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-16 Thread Alan Hourihane
On Thu, Apr 15, 2004 at 08:13:53AM -0700, Alex Deucher wrote: > Speaking of merging, what are everyone's thoughts on merging the DDX > trees (drivers at least, I don't know about the rest, especially with > the licensing)? I was thinking mostly DRI<->xfree86 but I suppose we > could look at gatos

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-15 Thread Alex Deucher
--- Michel Dänzer <[EMAIL PROTECTED]> wrote: > On Thu, 2004-04-15 at 17:13, Alex Deucher wrote: > > Speaking of merging, what are everyone's thoughts on merging the > DDX > > trees (drivers at least, I don't know about the rest, especially > with > > the licensing)? I was thinking mostly DRI<->xf

Re: [Dri-devel] DRI/Xfree86 Merge

2004-04-15 Thread Michel Dänzer
On Thu, 2004-04-15 at 17:13, Alex Deucher wrote: > Speaking of merging, what are everyone's thoughts on merging the DDX > trees (drivers at least, I don't know about the rest, especially with > the licensing)? I was thinking mostly DRI<->xfree86 but I suppose we > could look at gatos too. Specifi

[Dri-devel] DRI/Xfree86 Merge

2004-04-15 Thread Alex Deucher
Speaking of merging, what are everyone's thoughts on merging the DDX trees (drivers at least, I don't know about the rest, especially with the licensing)? I was thinking mostly DRI<->xfree86 but I suppose we could look at gatos too. Specifically the radeon driver has some new fixes in the xfree86