On Thu, Jul 30, 2020 at 8:37 AM Viresh Kumar viresh.kumar@linaro.org wrote:
On 30-07-20, 08:27, Rob Clark wrote:
Hmm, I've already sent my pull request to Dave, dropping the patch would require force-push and sending a new PR. Which I can do if Dave prefers. OTOH I guess it isn't the end of the world if the patch is merged via two different trees.
I don't think a patch can go via two trees, as that would have two sha keys for the same code.
it looks weird in the history, but other than that I think it is fine.. at least I see it happen somewhat regularly with fixes in drm
Though it is fine for a patch to go via two different trees if we make sure the same sha key is used for both.
Will it be possible for you to provide a branch/tag of your branch that I can base stuff of ?
You could use https://gitlab.freedesktop.org/drm/msm/-/commits/msm-next/ (or the tag drm-msm-next-2020-07-29), which already has the OPP patch. I've been trying to avoid force-pushing that because downstream trees are already pulling from that.
BR, -R