This is a direct commit to stable-10. The following options are disabled in all arm kernel configs: DEADLKRES DIAGNOSTIC INVARIANTS INVARIANTS_SUPPORT WITNESS WITNESS_SKIPSPIN Approved by: re(gjb)