24 Jun
2012
24 Jun
'12
6:24 a.m.
From: Antonio Quartulli ordex@autistici.org Date: Sat, 23 Jun 2012 17:45:12 +0200
after pulling these patchset in net, you should hit a conflict while trying to merge net into net-next. The conflict is caused by the renaming patches that you already have in the next tree.
Here are our instructions about how to solve it. Hope they will help.
Thanks a lot for this.