Re: linux-next: first tree
Jeff Garzik wrote: Please add the 'NEXT' branch of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git to your list. This is a throwaway meta-branch that is rebased often. Additional FYI: Don't be worried if git diff master..NEXT is empty from time to time. This condition occurs whenever the 'NEXT' queue is empty. Jeff -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: first tree
On Thu, Feb 14, 2008 at 12:20:32PM -0800, Greg KH wrote: On Fri, Feb 15, 2008 at 12:35:37AM +1100, Stephen Rothwell wrote: So, comments, please. Could you change the Makefile to show that if we build and run this tree, it really isn't Linus's tree? Yes, I know the -git number will be different, but that might not be very obvious to people reading bug reports on lkml. Just adding -next to the extraversion would be great. A non-intrusive way to do so would be to add a file in the top-level directory and name it localversion*. For example: echo '-next' localversion-next Sam -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: first tree
On Thu, 2008-02-14 at 16:03 -0500, Jeff Garzik wrote: Stephen Rothwell wrote: Also, more trees please ... :-) Please add the 'NEXT' branch of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git to your list. This is a throwaway meta-branch that is rebased often. The 'master' branch of libata-dev.git always contains the base commit from torvalds/linux-2.6.git from which all other branches are based. I never ever commit to the 'master' branch, only update it from torvalds/linux-2.6.git. Andrew, I will continue to maintain the 'ALL' branch exactly as before. It may contain changes not suitable for 'NEXT', but suitable for -mm testing. In my new development process, things will almost always land in 'ALL' before 'NEXT'. So does this indicate the meaning of upstream and upstream-fixes is still the same? I always took upstream-fixes to be bug fixes for this -rc and upstream as queued for the next merge window, in which case NEXT would be the union of those two sets? James -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: first tree
Hi Paul, On Fri, 15 Feb 2008 00:49:28 +0900 Paul Mundt [EMAIL PROTECTED] wrote: For SH: master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git Added, thanks. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpsZoqKbvwi6.pgp Description: PGP signature
Re: linux-next: first tree
Hi Dave, On Thu, 14 Feb 2008 09:54:02 -0600 Dave Kleikamp [EMAIL PROTECTED] wrote: Please add: git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git next Added, thanks. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgp0s5oguWWPP.pgp Description: PGP signature
Re: linux-next: first tree
James Bottomley wrote: So does this indicate the meaning of upstream and upstream-fixes is still the same? I always took upstream-fixes to be bug fixes for this -rc and upstream as queued for the next merge window, in which case NEXT would be the union of those two sets? In practice, #upstream-fixes isn't very useful, because I send its contents to Linus very very rapidly once they are committed to that branch. I then locally delete that branch once Linus merges it, and re-create it [again, locally] the next time I have some bug fixes to apply. So it is a somewhat throwaway branch. The main utility of #upstream-fixes is so that I can do git branch upstream-linus upstream-fixes and then continue making commits in parallel with a Linus pull+push cycle. The #upstream branch is much more useful, because that is where things for the next kernel are stored, during a bug-fix-only cycle. This is largely equivalent to NEXT, though I plan to be more stringent in my requirements for NEXT commits than #upstream commits. One thing to note is that pure rebases are somewhat rare; I much prefer to wait until the batch of commits lands in torvalds/linux-2.6.git, before I blow away and recreate (with a new torvalds HEAD) the branch in question. So, to answer your question... Fixes should go upstream fast enough that they should hit NEXT implicitly via a Linus pull+push. It should be the union of two sets, yes, if a Linus cycle takes a long time. When both #upstream and #upstream-fixes are active, I tend to always branch #upstream off of #upstream-fixes and/or do a git pull . upstream-fixes when updating #upstream. Jeff -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: first tree
Hi Martin, On Thu, 14 Feb 2008 16:25:09 +0100 Martin Schwidefsky [EMAIL PROTECTED] wrote: For the s390 architecture please use the features branch of git390: git://git390.osdl.marist.edu/pub/scm/linux-2.6.git features Added thanks. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgppXSLG0TXcl.pgp Description: PGP signature
Re: linux-next: first tree
Hi Mauro, On Thu, 14 Feb 2008 15:38:50 -0200 Mauro Carvalho Chehab [EMAIL PROTECTED] wrote: Please add v4l-dvb tree, at: ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git The above tree has two branches: 'master' and 'stable' Both branches will have V4L/DVB next patches. The first is against your master, and the second, against your stable. I've opted to have both trees, since probably 'stable' is the better option for you to clone. On the other hand, 'master' allow me to foresee if an alien patch would conflict with a subsystem patch. OK, this looks good (I should read ahead in my email before replying :-)). I will fetch the stable branch of this tree instead of the previous tree you sent me, OK? -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgprFdDuFBrao.pgp Description: PGP signature
Re: linux-next: first tree
On Fri, 2008-02-15 at 00:35 +1100, Stephen Rothwell wrote: Also, more trees please ... :-) Please add the 'linux-next' branch of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git Cheers Trond -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: first tree
Hi Greg, On Thu, 14 Feb 2008 12:20:32 -0800 Greg KH [EMAIL PROTECTED] wrote: Could you change the Makefile to show that if we build and run this tree, it really isn't Linus's tree? Yes, I know the -git number will be different, but that might not be very obvious to people reading bug reports on lkml. Just adding -next to the extraversion would be great. Yes, sure, I should have though of that. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgp8xvS0SSBZv.pgp Description: PGP signature
Re: linux-next: first tree
Hi Sam, On Thu, 14 Feb 2008 21:23:23 +0100 Sam Ravnborg [EMAIL PROTECTED] wrote: git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git master Added, thanks. It is rebased from time to time and is what gets into -mm That's fine. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpmqotEbvyzz.pgp Description: PGP signature
Re: linux-next: first tree
On Fri, Feb 15, 2008 at 12:35:37AM +1100, Stephen Rothwell wrote: Also, more trees please ... :-) The current XFS tree that goes into -mm is: git://oss.sgi.com:8090/xfs/xfs-2.6.git master Cheers, Dave. -- Dave Chinner Principal Engineer SGI Australian Software Group -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: first tree
Hi Sam, On Thu, 14 Feb 2008 21:50:31 +0100 Sam Ravnborg [EMAIL PROTECTED] wrote: A non-intrusive way to do so would be to add a file in the top-level directory and name it localversion*. For example: echo '-next' localversion-next Excellent, I will do this for the next release. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgplcycB2SwzS.pgp Description: PGP signature
Re: linux-next: first tree
Hi Jeff, On Thu, 14 Feb 2008 16:03:19 -0500 Jeff Garzik [EMAIL PROTECTED] wrote: Please add the 'NEXT' branch of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git to your list. This is a throwaway meta-branch that is rebased often. Added, thanks. I will continue to maintain the 'ALL' branch exactly as before. It may contain changes not suitable for 'NEXT', but suitable for -mm testing. In my new development process, things will almost always land in 'ALL' before 'NEXT'. Sounds like a good plan. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpFJsmx0PGc4.pgp Description: PGP signature
Re: linux-next: first tree
Hi Trond, On Thu, 14 Feb 2008 17:27:57 -0500 Trond Myklebust [EMAIL PROTECTED] wrote: Please add the 'linux-next' branch of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git Added, thanks. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpcqk1hXNNWj.pgp Description: PGP signature
Re: linux-next: first tree
Hi David, On Fri, 15 Feb 2008 10:17:02 +1100 David Chinner [EMAIL PROTECTED] wrote: The current XFS tree that goes into -mm is: git://oss.sgi.com:8090/xfs/xfs-2.6.git master Added, thanks. I have put you as the contact point - is this correct? I notice that the MAINTAINERS file has a different contact for XFS. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpApeVVm7yUy.pgp Description: PGP signature
Re: linux-next: first tree
On Fri, Feb 15, 2008 at 11:50:40AM +1100, Stephen Rothwell wrote: Hi David, On Fri, 15 Feb 2008 10:17:02 +1100 David Chinner [EMAIL PROTECTED] wrote: The current XFS tree that goes into -mm is: git://oss.sgi.com:8090/xfs/xfs-2.6.git master Added, thanks. I have put you as the contact point - is this correct? Not really ;) I notice that the MAINTAINERS file has a different contact for XFS. Yup - [EMAIL PROTECTED] If you want a real person on the end of problem reports feel free to leave me there, but you should really also cc the xfs-masters address as well to guarantee that the problem is seen and dealt with promptly as I'm not always available. Cheers, Dave. -- Dave Chinner Principal Engineer SGI Australian Software Group -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: first tree
On Thursday 14 February 2008 10:00, Stephen Rothwell wrote: Hi Rafael, On Thu, 14 Feb 2008 15:45:55 +0100 Rafael J. Wysocki [EMAIL PROTECTED] wrote: Perhaps you can add: git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 test I would prefer that the trees be added by the subsystem maintainers and they can tell me which branch represents their expectations for the next kernel release (in this case 2.6.26). But thanks, hopefully you will have prodded them along. :-) Rafael has it right, please add the branch above. It will include both the upcoming ACPI and suspend patches. Note that I reserve the right to re-base it from time to time - so when you pull it, you want to pull it onto a new branch vs. Linux rather than onto a previous copy of itself. thanks, -Len -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: first tree
Hi Len, On Thu, 14 Feb 2008 23:58:38 -0500 Len Brown [EMAIL PROTECTED] wrote: Rafael has it right, please add the branch above. It will include both the upcoming ACPI and suspend patches. Added, thanks, with you as contact. Note that I reserve the right to re-base it from time to time - so when you pull it, you want to pull it onto a new branch vs. Linux rather than onto a previous copy of itself. That is fine, I expect rebases. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpbqdml5C2dH.pgp Description: PGP signature
