Re: 2.6.33 -next tree

2009-12-09 Thread Grant Likely
On Wed, Dec 9, 2009 at 2:26 AM, Luotao Fu wrote: > Hi Grant, > > Grant Likely wrote: >> Hi Ben, Stephen. >> >> I just prepared my next branch for 2.6.33: >> git://git.secretlab.ca/git/linux-2.6 next >> > > Just for curiosity: I noticed that you keep so far the further patches for the > dedicated s

Re: 2.6.33 -next tree

2009-12-09 Thread Luotao Fu
Hi Grant, Grant Likely wrote: > Hi Ben, Stephen. > > I just prepared my next branch for 2.6.33: > git://git.secretlab.ca/git/linux-2.6 next > Just for curiosity: I noticed that you keep so far the further patches for the dedicated spi controller on mpc5200 in the next-spi tree. Any plan when th

Re: 2.6.33 -next tree

2009-12-08 Thread Benjamin Herrenschmidt
On Tue, 2009-12-08 at 22:25 -0600, Olof Johansson wrote: > On Tue, Dec 08, 2009 at 02:45:05PM -0800, Andrew Morton wrote: > > On Wed, 09 Dec 2009 09:29:43 +1100 > > Benjamin Herrenschmidt wrote: > > > > > On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote: > > > > This tree has also been in li

Re: 2.6.33 -next tree

2009-12-08 Thread Olof Johansson
On Tue, Dec 08, 2009 at 02:45:05PM -0800, Andrew Morton wrote: > On Wed, 09 Dec 2009 09:29:43 +1100 > Benjamin Herrenschmidt wrote: > > > On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote: > > > This tree has also been in linux-next for a while now, so it should be > > > a safe pull. > > >

Re: 2.6.33 -next tree

2009-12-08 Thread Grant Likely
On Tue, Dec 8, 2009 at 3:45 PM, Andrew Morton wrote: > On Wed, 09 Dec 2009 09:29:43 +1100 > Benjamin Herrenschmidt wrote: > >> On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote: >> > >> > Are you able to pull this tree, or should I ask Linus to pull it >> > directly? >> > >> > It contains mpc

Re: 2.6.33 -next tree

2009-12-08 Thread Andrew Morton
On Wed, 09 Dec 2009 09:29:43 +1100 Benjamin Herrenschmidt wrote: > On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote: > > > > Are you able to pull this tree, or should I ask Linus to pull it > > directly? > > > > It contains mpc5200 and xilinx stuff. Some of it is SPI related, but > > I'm

Re: 2.6.33 -next tree

2009-12-08 Thread Benjamin Herrenschmidt
On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote: > > Are you able to pull this tree, or should I ask Linus to pull it > directly? > > It contains mpc5200 and xilinx stuff. Some of it is SPI related, but > I'm now the SPI co-maintainer, so I have no problem with it going in > via your tree.

Re: 2.6.33 -next tree

2009-12-08 Thread Grant Likely
Ben, here's an updated pull request. Can you please pull and send them up to Linus? I've added 4 more commits related to the 5200 GPT timer. These commits have also have linux-next exposure, I just had them in the wrong branch. One commit touches drivers/watchdog, but I got an ack from Wim to m

Re: 2.6.33 -next tree

2009-12-08 Thread Grant Likely
On Wed, Nov 4, 2009 at 11:10 PM, Grant Likely wrote: > Hi Ben, Stephen. > > I just prepared my next branch for 2.6.33: > git://git.secretlab.ca/git/linux-2.6 next > > Steven, can you please add this tree to your linux-next pull list? > This is the branch where I put stuff that gets fed up to Ben.