[git pull] Please pull powerpc.git next branch

2009-12-12 Thread Benjamin Herrenschmidt
Hi Linus ! So here's finally the powerpc merge for this window. I was waiting to sort out some stuff with the Nintendo Gamecube and Wii patches but in the end, I may as well have them in a separate pull request rather than waiting longer. Among the highlights this time around, there's Alex new 64

Re: [git pull] Please pull powerpc.git next branch

2009-09-15 Thread Michael Ellerman
On Tue, 2009-09-15 at 14:09 -0700, Geoff Levand wrote: > Hi Ben, > > On 09/11/2009 12:17 AM, Benjamin Herrenschmidt wrote: > > This is the powerpc batch for 2.6.32. > > Will we ever get this one in... > > http://lists.ozlabs.org/pipermail/linuxppc-dev/2009-June/073567.html I thought it was in

Re: [git pull] Please pull powerpc.git next branch

2009-09-15 Thread Michel Dänzer
On Wed, 2009-09-16 at 07:51 +1000, Benjamin Herrenschmidt wrote: > On Tue, 2009-09-15 at 09:53 -0700, Linus Torvalds wrote: > > It got a conflict with the AGP merge, but I fixed it up in what _seemed_ > > to be the obvious manner. But somebody should check out the resulting > > drivers/char/agp/u

Re: [git pull] Please pull powerpc.git next branch

2009-09-15 Thread Benjamin Herrenschmidt
On Tue, 2009-09-15 at 09:53 -0700, Linus Torvalds wrote: > It got a conflict with the AGP merge, but I fixed it up in what _seemed_ > to be the obvious manner. But somebody should check out the resulting > drivers/char/agp/uninorth-agp.c file. Thanks. Michel, can you dbl check it ? Cheers, Ben

Re: [git pull] Please pull powerpc.git next branch

2009-09-15 Thread Geoff Levand
Hi Ben, On 09/11/2009 12:17 AM, Benjamin Herrenschmidt wrote: > This is the powerpc batch for 2.6.32. Will we ever get this one in... http://lists.ozlabs.org/pipermail/linuxppc-dev/2009-June/073567.html -Geoff ___ Linuxppc-dev mailing list Linuxppc-

Re: [git pull] Please pull powerpc.git next branch

2009-09-15 Thread Linus Torvalds
On Tue, 15 Sep 2009, Benjamin Herrenschmidt wrote: > > So I don't know at this stage how to generate a "clean" pull request ... It's rare, for but future reference, what you can do is to just do a merge in a temporary branch, and get it that way. 'git shortlog' should have worked, though. It'

Re: [git pull] Please pull powerpc.git next branch

2009-09-15 Thread Benjamin Herrenschmidt
On Fri, 2009-09-11 at 17:18 +1000, Benjamin Herrenschmidt wrote: > Hi Linus ! > > This is the powerpc batch for 2.6.32. > > You will notice a bunch of generic swiotlb changes along with > corresponding changes to arch/sparc and arch/x86 from Fujita Tomonori. > > There are due to my tree having p

[git pull] Please pull powerpc.git next branch

2009-09-11 Thread Benjamin Herrenschmidt
Hi Linus ! This is the powerpc batch for 2.6.32. You will notice a bunch of generic swiotlb changes along with corresponding changes to arch/sparc and arch/x86 from Fujita Tomonori. There are due to my tree having pulled Ingo's iommu tree do sort out various dependencies. If you pull Ingo's firs

[git pull] Please pull powerpc.git next branch

2009-01-07 Thread Benjamin Herrenschmidt
Hi Linus The following changes since commit 9e42d0cf5020aaf217433cad1a224745241d212a: Linus Torvalds (1): Merge git://git.kernel.org/.../davem/sparc-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next Those are remaining bi

[git pull] Please pull powerpc.git next branch

2008-12-28 Thread Paul Mackerras
Linus, Please pull from the 'next' branch of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git next to get a powerpc update. This has a minor conflict with your tree in drivers/char/Makefile where two lines were added at the same place; the resolution is to keep both. If you pre

<    1   2