On Tuesday, May 04, 2010 1:12 PM, Greg KH wrote: >>> 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. Ok. >> Which would probably explain the conflict that occurs in linux-next for >> dt3155_drv.c. > > Yes. And how easy it is to fix up :) Ok. >> 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. I may be seeing the correct stuff now in your staging-next tree just not in linux-next due to the two commits above. > Are you _sure_ you have the 'staging-next' branch of the tree checked > out? Am I _sure_... No... Do I _think_ so... Yes... ;-) Would you like me to rebase the patch to staging-next to see? But, will this run into a similar problem with the two commits already in Linus' tree? If so I can just hold off again until everything catches up. Regards, Hartley _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
