Re: Updates to powerpc.git

2008-07-14 Thread Benjamin Herrenschmidt
On Mon, 2008-07-14 at 15:49 +1000, Stephen Rothwell wrote: > Hi Ben, > > On Mon, 14 Jul 2008 15:32:36 +1000 Benjamin Herrenschmidt <[EMAIL PROTECTED]> > wrote: > > > > -next and -merge are now both to the same level, which is the same > > I think you meant -master (not -merge). Yup, typo, sorry

Re: Updates to powerpc.git

2008-07-13 Thread Stephen Rothwell
Hi Ben, On Mon, 14 Jul 2008 15:32:36 +1000 Benjamin Herrenschmidt <[EMAIL PROTECTED]> wrote: > > -next and -merge are now both to the same level, which is the same I think you meant -master (not -merge). -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.

Re: Updates to powerpc.git

2008-07-13 Thread Benjamin Herrenschmidt
On Wed, 2008-07-09 at 17:34 +1000, Benjamin Herrenschmidt wrote: > > It contains 3 branches: > > - merge : this is for merging with the current stable and doesn't > currently contain anything interesting > > - master : this is our current "powerpc.git" tree, it may contain >

Re: Updates to powerpc.git

2008-07-11 Thread Benjamin Herrenschmidt
On Wed, 2008-07-09 at 09:18 -0400, Josh Boyer wrote: > > If you want to use your master branch as a place for experimental > stuff, that's fine by me. But you'll want to keep next separate from > it so it's as "clean" as possible for those trying to track what is > definitely going into the next

Re: Updates to powerpc.git

2008-07-11 Thread Grant Likely
On Sat, Jul 12, 2008 at 01:30:58PM +1000, Benjamin Herrenschmidt wrote: > > > What is your intent with the 'master' branch? I hope you do NOT plan > > on ever rebasing it. I assume if a patch gets into master and we drop > > it you'll do a git-revert of it? > > I'll try as much as possible.

Re: Updates to powerpc.git

2008-07-11 Thread Benjamin Herrenschmidt
> What is your intent with the 'master' branch? I hope you do NOT plan > on ever rebasing it. I assume if a patch gets into master and we drop > it you'll do a git-revert of it? I'll try as much as possible. But I'll keep the option open. "next" is the one that should never be rebased I'd s

Re: Updates to powerpc.git

2008-07-09 Thread Grant Likely
On Thu, Jul 10, 2008 at 03:23:46AM +1000, Stephen Rothwell wrote: > Hi Grant, > > On Wed, 9 Jul 2008 10:20:08 -0600 Grant Likely <[EMAIL PROTECTED]> wrote: > > > > I was under the impression that there was some consensus that -next > > branches should be used for unstable experiments. Am I mistak

Re: Updates to powerpc.git

2008-07-09 Thread Stephen Rothwell
Hi Kumar, On Wed, 9 Jul 2008 11:47:45 -0500 Kumar Gala <[EMAIL PROTECTED]> wrote: > > Did, GregKH start up a tree for code not quite ready ( -staging). Greg's staging tree is for whole drivers etc not in the kernel yet that need work to get there. -- Cheers, Stephen Rothwell

Re: Updates to powerpc.git

2008-07-09 Thread Josh Boyer
On Wed, 9 Jul 2008 11:47:45 -0500 Kumar Gala <[EMAIL PROTECTED]> wrote: > > On Jul 9, 2008, at 11:31 AM, Josh Boyer wrote: > > > On Wed, 2008-07-09 at 10:20 -0600, Grant Likely wrote: > >> On Thu, Jul 10, 2008 at 02:08:32AM +1000, Stephen Rothwell wrote: > >>> Kumar, > >>> > >>> On Wed, 9 Jul 20

Re: Updates to powerpc.git

2008-07-09 Thread Stephen Rothwell
Hi Grant, On Wed, 9 Jul 2008 10:20:08 -0600 Grant Likely <[EMAIL PROTECTED]> wrote: > > I was under the impression that there was some consensus that -next > branches should be used for unstable experiments. Am I mistaken? Completely. Anything that will end up in linux-next must be posted, revi

Re: Updates to powerpc.git

2008-07-09 Thread Kumar Gala
On Jul 9, 2008, at 11:31 AM, Josh Boyer wrote: On Wed, 2008-07-09 at 10:20 -0600, Grant Likely wrote: On Thu, Jul 10, 2008 at 02:08:32AM +1000, Stephen Rothwell wrote: Kumar, On Wed, 9 Jul 2008 07:58:38 -0500 Kumar Gala <[EMAIL PROTECTED] > wrote: What is your intent with the 'master' bra

Re: Updates to powerpc.git

2008-07-09 Thread Josh Boyer
On Wed, 2008-07-09 at 10:20 -0600, Grant Likely wrote: > On Thu, Jul 10, 2008 at 02:08:32AM +1000, Stephen Rothwell wrote: > > Kumar, > > > > On Wed, 9 Jul 2008 07:58:38 -0500 Kumar Gala <[EMAIL PROTECTED]> wrote: > > > > > > What is your intent with the 'master' branch? I hope you do NOT plan

Re: Updates to powerpc.git

2008-07-09 Thread Grant Likely
On Thu, Jul 10, 2008 at 02:08:32AM +1000, Stephen Rothwell wrote: > Kumar, > > On Wed, 9 Jul 2008 07:58:38 -0500 Kumar Gala <[EMAIL PROTECTED]> wrote: > > > > What is your intent with the 'master' branch? I hope you do NOT plan > > on ever rebasing it. I assume if a patch gets into master and

Re: Updates to powerpc.git

2008-07-09 Thread Stephen Rothwell
Kumar, On Wed, 9 Jul 2008 07:58:38 -0500 Kumar Gala <[EMAIL PROTECTED]> wrote: > > What is your intent with the 'master' branch? I hope you do NOT plan > on ever rebasing it. I assume if a patch gets into master and we drop > it you'll do a git-revert of it? "Ever" is such a strong word. E

Re: Updates to powerpc.git

2008-07-09 Thread Grant Likely
On Wed, Jul 09, 2008 at 08:40:21AM -0500, Kumar Gala wrote: > > On Jul 9, 2008, at 8:18 AM, Josh Boyer wrote: > >> On Wed, 09 Jul 2008 17:34:41 +1000 >> Benjamin Herrenschmidt <[EMAIL PROTECTED]> wrote: >> Also, Paul is pretty good about not rebasing his branches when at all >> possible, and I susp

Re: Updates to powerpc.git

2008-07-09 Thread Kumar Gala
On Jul 9, 2008, at 8:18 AM, Josh Boyer wrote: On Wed, 09 Jul 2008 17:34:41 +1000 Benjamin Herrenschmidt <[EMAIL PROTECTED]> wrote: I've pushed some updates to my version of powerpc.git. The tree itself is at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git It contains 3 bra

Re: Updates to powerpc.git

2008-07-09 Thread Josh Boyer
On Wed, 09 Jul 2008 17:34:41 +1000 Benjamin Herrenschmidt <[EMAIL PROTECTED]> wrote: > I've pushed some updates to my version of powerpc.git. > > The tree itself is at: > >  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git > > It contains 3 branches: > > - merge : this is fo

Re: Updates to powerpc.git

2008-07-09 Thread Kumar Gala
On Jul 9, 2008, at 2:34 AM, Benjamin Herrenschmidt wrote: I've pushed some updates to my version of powerpc.git. The tree itself is at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git It contains 3 branches: - merge : this is for merging with the current stable and doesn't

Updates to powerpc.git

2008-07-09 Thread Benjamin Herrenschmidt
I've pushed some updates to my version of powerpc.git. The tree itself is at:  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git It contains 3 branches: - merge : this is for merging with the current stable and doesn't currently contain anything interesting - m