Re: [Intel-gfx] drivers/drm/i915 maintenance process

2011-06-06 Thread Jesse Barnes
On Mon, 6 Jun 2011 16:30:25 -0700 Jesse Barnes wrote: > On Mon, 06 Jun 2011 16:24:46 -0700 > Keith Packard wrote: > > > On Mon, 6 Jun 2011 13:36:18 -0700, Jesse Barnes > > wrote: > > > > > Can you keep drm-intel-next fairly up to date with respect to the fixes > > > branch? I.e. keep it a s

[Intel-gfx] drivers/drm/i915 maintenance process

2011-06-06 Thread Jesse Barnes
On Mon, 6 Jun 2011 16:30:25 -0700 Jesse Barnes wrote: > On Mon, 06 Jun 2011 16:24:46 -0700 > Keith Packard wrote: > > > On Mon, 6 Jun 2011 13:36:18 -0700, Jesse Barnes > virtuousgeek.org> wrote: > > > > > Can you keep drm-intel-next fairly up to date with respect to the fixes > > > branch? I

Re: drivers/drm/i915 maintenance process

2011-06-06 Thread Jesse Barnes
On Mon, 06 Jun 2011 16:24:46 -0700 Keith Packard wrote: > On Mon, 6 Jun 2011 13:36:18 -0700, Jesse Barnes > wrote: > > > Can you keep drm-intel-next fairly up to date with respect to the fixes > > branch? I.e. keep it a superset of drm-intel-fixes for the most part? > > Yes, I wanted to do t

drivers/drm/i915 maintenance process

2011-06-06 Thread Jesse Barnes
On Mon, 06 Jun 2011 16:24:46 -0700 Keith Packard wrote: > On Mon, 6 Jun 2011 13:36:18 -0700, Jesse Barnes > wrote: > > > Can you keep drm-intel-next fairly up to date with respect to the fixes > > branch? I.e. keep it a superset of drm-intel-fixes for the most part? > > Yes, I wanted to do t

Re: drivers/drm/i915 maintenance process

2011-06-06 Thread Keith Packard
On Mon, 6 Jun 2011 13:36:18 -0700, Jesse Barnes wrote: > Can you keep drm-intel-next fairly up to date with respect to the fixes > branch? I.e. keep it a superset of drm-intel-fixes for the most part? Yes, I wanted to do that now, but -fixes is not a fast-forward from -next and I thought I sho

drivers/drm/i915 maintenance process

2011-06-06 Thread Keith Packard
On Mon, 6 Jun 2011 13:36:18 -0700, Jesse Barnes wrote: > Can you keep drm-intel-next fairly up to date with respect to the fixes > branch? I.e. keep it a superset of drm-intel-fixes for the most part? Yes, I wanted to do that now, but -fixes is not a fast-forward from -next and I thought I sho

Re: drivers/drm/i915 maintenance process

2011-06-06 Thread Jesse Barnes
On Sat, 04 Jun 2011 23:05:23 -0700 "Keith Packard" wrote: > 1) drm-intel-next > > This contains work destined for the 'next' release, it may include > new functionality and performance enhancements. It may also cause > regressions on some hardware. The tip of this tree will be sent

drivers/drm/i915 maintenance process

2011-06-06 Thread Jesse Barnes
On Sat, 04 Jun 2011 23:05:23 -0700 "Keith Packard" wrote: > 1) drm-intel-next > > This contains work destined for the 'next' release, it may include > new functionality and performance enhancements. It may also cause > regressions on some hardware. The tip of this tree will be sent

drivers/drm/i915 maintenance process

2011-06-05 Thread Dave Airlie
On Sat, 2011-06-04 at 23:05 -0700, Keith Packard wrote: > I'm trying to formalize the process for merging code into the drm/i915 > driver. Here's a first draft, please send along your comments. Okay so you made the same mistake a lot of people make, the merge window for -next from me to Linus is f

Re: drivers/drm/i915 maintenance process

2011-06-05 Thread Keith Packard
On Sun, 05 Jun 2011 16:23:43 +1000, Dave Airlie wrote: > So when Linus is releasing rc4/5 you should really be cutting down stuff > going into your -next, and getting the tree ready for me to take. We can > probably add your tree direct to the -next git list as well so that we > can get the benef

drivers/drm/i915 maintenance process

2011-06-05 Thread Keith Packard
On Sun, 05 Jun 2011 16:23:43 +1000, Dave Airlie wrote: > So when Linus is releasing rc4/5 you should really be cutting down stuff > going into your -next, and getting the tree ready for me to take. We can > probably add your tree direct to the -next git list as well so that we > can get the benef

Re: drivers/drm/i915 maintenance process

2011-06-04 Thread Dave Airlie
On Sat, 2011-06-04 at 23:05 -0700, Keith Packard wrote: > I'm trying to formalize the process for merging code into the drm/i915 > driver. Here's a first draft, please send along your comments. Okay so you made the same mistake a lot of people make, the merge window for -next from me to Linus is f

drivers/drm/i915 maintenance process

2011-06-04 Thread Keith Packard
I'm trying to formalize the process for merging code into the drm/i915 driver. Here's a first draft, please send along your comments. -keith Right now, I'm merging patches destined for the 3.0 release in a kernel.org tree: git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git (yes

drivers/drm/i915 maintenance process

2011-06-04 Thread Keith Packard
I'm trying to formalize the process for merging code into the drm/i915 driver. Here's a first draft, please send along your comments. -keith Right now, I'm merging patches destined for the 3.0 release in a kernel.org tree: git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git (yes