On Monday, May 03, 2010 2:18 PM, Greg KH wrote: >>> Did you rebase this on the latest linux-next tree? >> >> I did. And I just re-did is again against next-20100503 and it generated the same patch. > > Wierd. > >> But, I just noticed this: >> >> $ git log drivers/staging/dt3155 >> commit 3c59b4691587b8977cc77ecf07985758a2ba0d97 >> Merge: 7f1e428 bed46a8 >> Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> >> Date: Mon May 3 14:17:49 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 >> >> Could the next tree be out of sync with your tree? > > Hm, some other tree might be doing something in those files. But the > fact that the drivers/staging/dt3155/dt3155_io.h was so wrong it thought > it was a revert, makes me suspect that you did it against something > else. > > If you make this against my staging-next tree at > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git > U sing the staging-next branch, does that make the patch different? Ok. Pulled your staging-next (thanks Joe). It's way different from linux-next and matches Linus' tree exactly. It's missing all of your "Drop the "_s"..." and "The typedef is not needed." patches. Of course I could be on the wrong branch for your staging-next tree. The only branches listed are: $ git branch -a * master remotes/origin/HEAD -> origin/master remotes/origin/master Regards, Hartley _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
