Upstream has accepted the NOP solution for arm and s390 but some patching may still be necessary. TBB is no longer required as the internal spinlocks are faster than the TBB implementation.