Re: [git pull] Please pull from powerpc.git merge branch

2008-07-25 Thread Benjamin Herrenschmidt
On Fri, 2008-07-25 at 17:38 -0700, Linus Torvalds wrote: > > On Sat, 26 Jul 2008, Benjamin Herrenschmidt wrote: > > > > Please pull from: > >  > > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge > > What odd character do you have there before the 'git://' and why? Hrm...

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-25 Thread Linus Torvalds
On Sat, 26 Jul 2008, Benjamin Herrenschmidt wrote: > > Please pull from: >  > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge What odd character do you have there before the 'git://' and why? It cuts-and-pastes into some whitespace that isn't space, and that the shell t

[git pull] Please pull from powerpc.git merge branch

2008-07-25 Thread Benjamin Herrenschmidt
Hi Linus ! Please pull from:  git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge To get one patch that fixes a boot problem introduced by yesterday's serie. Thanks ! Ben. arch/powerpc/kernel/cputable.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Nathan Ly

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-25 Thread Benjamin Herrenschmidt
On Fri, 2008-07-25 at 10:07 -0500, Kumar Gala wrote: > On Jul 25, 2008, at 3:13 AM, Benjamin Herrenschmidt wrote: > > > > > Benjamin Herrenschmidt (1): > > Move update_mmu_cache() declaration from tlbflush.h to pgtable.h > > I'm guessing this was pretty trivial, but please post patches to th

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-25 Thread Grant Likely
On Fri, Jul 25, 2008 at 2:10 PM, Linus Torvalds <[EMAIL PROTECTED]> wrote: > > > On Fri, 25 Jul 2008, Benjamin Herrenschmidt wrote: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge > > Ok, I got a conflict in arch/powerpc/platforms/52xx/Kconfig, you should > check that I

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-25 Thread Linus Torvalds
On Fri, 25 Jul 2008, Benjamin Herrenschmidt wrote: > > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Ok, I got a conflict in arch/powerpc/platforms/52xx/Kconfig, you should check that I fixed it up right and send me follow-up patches if required. Linus

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-25 Thread Kumar Gala
On Jul 25, 2008, at 3:13 AM, Benjamin Herrenschmidt wrote: Benjamin Herrenschmidt (1): Move update_mmu_cache() declaration from tlbflush.h to pgtable.h I'm guessing this was pretty trivial, but please post patches to the list even if you've committed them to your tree. - k _

[git pull] Please pull from powerpc.git merge branch

2008-07-25 Thread Benjamin Herrenschmidt
Hi Linus ! Here's what should be the last batch of 'features' for powerpc for this merge window, unless I missed something. The binfmt_elf change is the one discussed earlier, acked by Andrew, just slightly rebased on top of another binfmt_elf patch that went in in the meantime. git://git.kerne

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-22 Thread Kumar Gala
On Jul 22, 2008, at 2:32 AM, Benjamin Herrenschmidt wrote: Hi Linus ! Here's the second batch of powerpc updates. I should have a last one before the end of the merge window for things that are stealing dealing with conflicts or dependencies but we are getting there. So please pull from:

[git pull] Please pull from powerpc.git merge branch

2008-07-22 Thread Benjamin Herrenschmidt
Hi Linus ! Here's the second batch of powerpc updates. I should have a last one before the end of the merge window for things that are stealing dealing with conflicts or dependencies but we are getting there. So please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git me

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-17 Thread Kumar Gala
On Jul 16, 2008, at 12:01 AM, Benjamin Herrenschmidt wrote: On Wed, 2008-07-16 at 00:20 -0400, Dave Jones wrote: On Wed, Jul 16, 2008 at 11:34:03AM +1000, Ben Herrenschmidt wrote: Linus, I apologize in advance for the couple of merge commits in there. I merged your tree yesterday in order to

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-16 Thread Kumar Gala
On Jul 16, 2008, at 6:13 AM, Benjamin Herrenschmidt wrote: On Wed, 2008-07-16 at 10:51 +0200, Arnd Bergmann wrote: On Wednesday 16 July 2008, Dave Jones wrote: arch/powerpc/platforms/built-in.o: In function `ep8248e_mdio_probe': /builddir/build/BUILD/kernel-2.6.26/linux-2.6.26.ppc/arch/powerp

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-16 Thread Benjamin Herrenschmidt
On Wed, 2008-07-16 at 10:51 +0200, Arnd Bergmann wrote: > On Wednesday 16 July 2008, Dave Jones wrote: > > arch/powerpc/platforms/built-in.o: In function `ep8248e_mdio_probe': > > /builddir/build/BUILD/kernel-2.6.26/linux-2.6.26.ppc/arch/powerpc/platforms/82xx/ep8248e.c:129: > > undefined referenc

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-16 Thread Arnd Bergmann
On Wednesday 16 July 2008, Dave Jones wrote: > arch/powerpc/platforms/built-in.o: In function `ep8248e_mdio_probe': > /builddir/build/BUILD/kernel-2.6.26/linux-2.6.26.ppc/arch/powerpc/platforms/82xx/ep8248e.c:129: > undefined reference to `alloc_mdio_bitbang' > /builddir/build/BUILD/kernel-2.6.26/

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-15 Thread Benjamin Herrenschmidt
On Wed, 2008-07-16 at 00:20 -0400, Dave Jones wrote: > On Wed, Jul 16, 2008 at 11:34:03AM +1000, Ben Herrenschmidt wrote: > > Linus, > > > > I apologize in advance for the couple of merge commits in there. I > > merged your tree yesterday in order to fix a (fairly minor) conflict, > > and wai

Re: [git pull] Please pull from powerpc.git merge branch

2008-07-15 Thread Dave Jones
On Wed, Jul 16, 2008 at 11:34:03AM +1000, Ben Herrenschmidt wrote: > Linus, > > I apologize in advance for the couple of merge commits in there. I > merged your tree yesterday in order to fix a (fairly minor) conflict, > and waited for our autobuilder to test a whole bunch of configs > overn