On Wed, Jan 19, 2011 at 5:16 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Grant, > > On Wed, 19 Jan 2011 10:35:26 -0700 Grant Likely <grant.likely@xxxxxxxxxxxx> wrote: >> >> I've reorganized my git tree to be clearer, so I'd like to update the >> list of branches that you're pulling from me for linux-next: >> >> Here are the branches you're currently pulling: >> >> gcl-current git git://git.secretlab.ca/git/linux-2.6#merge >> 52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#next >> devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree >> spi git git://git.secretlab.ca/git/linux-2.6#next-spi >> >> I've been using 2 branches for each subsystem that I'm maintaining; >> one for bug fixes that should be merged relatively quickly, and one >> for linux-next. Most of the time the 'merge' branches are empty, but >> once in a while I've got a bugfix that I want to give wider testing >> before asking Linus to pull. So, I'm thinking that I'd like to change >> the trees that you merge to: >> >> 52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/merge >> 52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#powerpc/next >> >> devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge >> devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next >> >> spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge >> spi git git://git.secretlab.ca/git/linux-2.6#spi/next >> >> Does this sound reasonable to you? > > Looks good and all done. Thanks. > I think you may have not put your powerpx fix > into your powerpc/merge branch yet, though. It's in my devicetree/merge branch. g. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
