Messages in this thread | | | From | Linus Torvalds <> | Date | Fri, 2 Nov 2012 13:16:06 -0700 | Subject | Re: [RFC] hlist: drop the node parameter from iterators |
| |
On Thu, Nov 1, 2012 at 7:26 PM, Sasha Levin <sasha.levin@oracle.com> wrote: > > Here are some stats: > > - Applying the patch from -next on top of your current git head > results in 3 conflicts. > > - Applying the patch from your current git head on top of v3.6 results > in 18 conflicts. > > - Applying the patch from 3.6 on top of 3.5 results in 25 conflicts.
Ok, that sounds slightly painful, but not unmanageable.
Can you send me the actual patch, and I'll mull on this a bit more? I could run the coccinelle script myself, but I assume (maybe incorrectly?) that there are manual fixes to clean some stuff up afterwared..
Linus
| |