Shouldn't this patch come before the others, otherwise we're exposing unconditionally color OP uAPI to user-space in-between the first patch and this one? Usually we try to not have a broken kernel in intermediate commits. It's important for bisecting.