net: re-solve some conflicts after net -> net-next merge