Merge "msm: mpq8064: Fix vcap_fmt header potential compiler error"