I've merged net into net-next.
The worst conflict was cls_tcindex.c as Cong's fixes collided heavily with Vlad's work. The interim solution I used for this merge was to revert back to RCU. Please take a look at what I did and send me followups because I am absolutely certain that some are necessary :-))) Thanks!
