On Monday, May 03, 2010 3:45 PM, H Hartley Sweeten wrote: >>> 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 >> Using 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 It appears these are the patches missing in your staging-next tree that do exist in the linux-next tree: Staging: dt3155: remove "inline" usage Staging: dt3155: rename dt3155_fbuffer_s Staging: dt3155: rename dt3155_config_s Staging: dt3155: rename dt3155_read_t Staging: dt3155: rename dt3155_status_t Staging: dt3155: remove frame_info_t Staging: dt3155: remove TRUE/FALSE Staging: dt3155: remove #ifdef Staging: dt3155: allocator.c: sparse cleanups Staging: dt3155: fix parentheses and bracket spacing style issues Staging: dt3155: fix coding style issue in dt3155_isr.c Staging: dt3155: fix wait_ibsyclr function Staging: remove unused #include <linux/version.h> The first one that exists in both is: Staging: dt3155: fix 50Hz configuration Could the others be in a staging-stable branch? Regards, Hartley _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
