On Wed, Mar 18, 2015 at 09:30:24AM -0300, Mario J. Rugiero wrote: > I didn't expect that. Maybe I used the wrong linux-next? > Just to make sure, what should I be making the patches against? I made them > against the latest next branch I was able to find on Linus tree, is that > right? linux-next is usually the correct thing to use here, but note that I get lots of patches from lots of people and sometimes there are conflicts. Odds are someone had sent me patches that touched these files before you, and I applied them earlier in the day. If you want to work on staging patches, I suggest working off of my staging-testing branch of staging.git on git.kernel.org as that always has the latest set of patches I've accepted. There will always be conflicts at times, which is normal, but that should reduce them to a managable level. Hope this helps, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel