[PATCH 15/16] Revert "drm/i915: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN()"

[Daniel Vetter]

On Mon, Oct 04, 2021 at 10:31:04PM +0200, Fernando Ramos wrote:
> On 21/10/04 11:56AM, Sean Paul wrote:
> > @Fernando, hopefully you can revise and post again. Thank you for your patches
> > and your effort!
> 
> No problem :)
> 
> Just to be sure I do the right thing this time (and to better understand the
> process), please confirm that this is the correct sequence of events:
> 
>   1. I fix the lock issue and test on my local machine.
> 
>   2. I then post this new patch set (v3) rebased on top of drm-tip (instead of
>      drm-next). This will automatically trigger tests on intel hardware (and
>      maybe in other hardwares?)
> 
>         NOTE: I originally chose drm-next because that's what is mentioned here:
>         https://01.org/linuxgraphics/gfx-docs/drm/gpu/introduction.html#contribution-process
>         Maybe this doc should be updated?
> 
>   3. Once reviewed and approved, someone (Sean?) merges them into "somewhere"
>      (drm-next? drm-misc-next? drm-intel-next? How is this decided?).
> 
>   4. Eventually, that other branch from the previous point is merged into
>      drm-tip.
> 
>   5. ??
> 
>   6. The branch is merged into linux-next.

This part should happen automatically, plus/minus right around the merge
window. At least not your problem.

Otherwise don't worry, and don't sweat it too much. We know that our CI
situation just isn't great yet for drm contributors :-/ There's plans to
improve it though, but it all takes time.

> There must be something wrong in my description above, as it doesn't make sense
> to post the patch series based on "drm-tip" only to later have one of the
> mainteiners merge them into a different branch that will eventually be merged
> back into "drm-tip".
> 
> Sorry for being completely lost! Is there a document explaining how all of this
> works so that I can learn for the next time?

drm-tip is just linux-next for drm area, it's the same principle. If there
are conflicts while merging, maintainers will sort these out. And yeah
that's a bit a speciality of linux with the multi-branch model for
development.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch