23 Apr
2013
23 Apr
'13
12:40 a.m.
From: Antonio Quartulli ordex@autistici.org Date: Fri, 19 Apr 2013 10:26:51 +0200
here are the instructions to resolve the conflicts you will get while merging net into net-next.
Thanks.
I'm now going to send a pull request to fix some compile issues generated by the merge.
We never fix such breakage separately.
We put these kinds of things in the merge commit, so proper bisecting is possible over the merge. And that's what I did just now.