Merge "base: genlock: remove BIT macro usage" into msm-3.0