sorry, the patches were bases on net-2.6. That's probably why you saw
the conflicts. I wasn't sure where they should go since they actually
fix a long standing issue, so I bases them net-2.6.
I think even if we wanted to eventually submit this to the stable
tree(s), we should let it cook in net-next for a while because
it's on the invasive side.