Hi, I can see that the "Add Wake-on-LAN driver for Microsemi PHYs" (0a55c12f97) patch has been applied to net-next, and that it is causing the Edge-Rate patch to conflict.
I have therefore rebased v10 of the patch to fit on top of net-next. /Allan -- 2.7.3