On Tue, May 04, 2010 at 03:02:35PM -0500, H Hartley Sweeten wrote: > On Tuesday, May 04, 2010 12:07 PM, Joe Perches wrote: > > On Mon, 2010-05-03 at 19:54 -0700, Greg KH wrote: > >>> git push? > >> I have, and they look to be there to me: > >> http://git.kernel.org/?p=linux/kernel/git/gregkh/staging-next-2.6.git;a=commit;h=4f923d004396ef272600d381a365cac9d832486d > >> So something must be odd on your side. > > > > Yup, sorry, my mistake. > > > > staging-next is the name of your repository as well as > > a branch within your repository and git after git clone > > doesn't by default show all remote branches. > > > > $ git clone --reference=linux-2.6 \ > > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git > > > > $ git branch -r > > origin/HEAD -> origin/master > > origin/master > > origin/staging-next > > > > I needed to add a git checkout origin/staging-next > > That tree is still missing a couple commits that are in Linus' tree: > > commit 6536560cabab170ed2969b005bf69a496e9c45bf > Staging: dt3155: fix 50Hz configuration > > commit 74a920139a0f1119c5a604cef0ce5d6f591dc782 > staging: fix dt3155 build Yes, if you look, the staging-next branch starts on Linus's tree as of April 8 (just after 2.6.34-rc3). I don't merge back to Linus's tree a bunch, because that is not how it should be done. When I am going to push these to Linus, then I will merge and handle any fixups if needed. > Which would probably explain the conflict that occurs in linux-next for > dt3155_drv.c. Yes. And how easy it is to fix up :) > commit 9e1bd9a6f8c6ad8b461294a365c49b19212178d9 > Merge: 5382319 e595eea > Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Tue May 4 15:42:20 2010 +1000 > > Merge remote branch 'staging-next/staging-next' > > Conflicts: > drivers/staging/arlan/arlan-main.c > drivers/staging/comedi/drivers/cb_das16_cs.c > drivers/staging/cx25821/cx25821-alsa.c > drivers/staging/dt3155/dt3155_drv.c > drivers/staging/netwave/netwave_cs.c That doesn't explain how you aren't seeing the correct stuff to base your patches off of though. Are you _sure_ you have the 'staging-next' branch of the tree checked out? thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
