On Sat, 4 Apr 2015, Ralf Baechle wrote: > > Clean-ups come first as they should be completely uncontroversial, > > followed by restructuring, bug fixes and new features. > > It would have been nice if the bug fixes or at least those relevant to > 4.0 and older were at the beginning to reduce issue when applying them > to the 4.0-fixes and possibly -stable branches. Good point, I will keep it in mind in the future. I think there's actually little if any overlap here though, you should be able to ignore comment and formatting changes when doing any backports and the rest should just apply right away. I can send you a pre-r6 version of the relevant patches too if that would help -- I think there are 3 or 4 that I had to rework while rebasing from 3.19 to 4.0. > I applied your patches on top of my working branch and ran into a number > of conflicts. Will push the result out as soon as I'm done with the > conflict resolution. Great, thanks! Is there a better branch than master of ralf/linux.git to base patches submitted against so as to save you from the need to sort out conflicts? Let me know if you need help with any unobvious 3-way merge too. Maciej
