I built i386 UP debugging kernel, and amd64 SMP debugging/production kernels with this patch. Make universe is due after acceptance.
One moment is probably worth a clarification. I believe that locks have stable layout now, regardless of the witness, lock profiling or other supportive machinery. If this becomes no longer the case, then asserts would be only enabled for production kernels on all branches.