[PATCH 1/2] dim: Caution more against topic branches

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Thu Nov 25 11:21:45 UTC 2021


On 25-11-2021 12:19, Daniel Vetter wrote:
> They're very often just beaurocratic paperwork pushing because
> maintainers refuse to give acks for merging patches through a single
> tree. I guess the snarky intro wasn't clear enough, so elaborate.
>
> Given that we don't even talk about topic branches anywhere else in
> the docs hopefully this makes things a bit clearer.
>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Lyude Paul <lyude at redhat.com>
> Cc: Thomas Zimmermann <tzimmermann at suse.de>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Maxime Ripard <mripard at kernel.org>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  dim.rst | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/dim.rst b/dim.rst
> index 60c688d6c027..41d9f0e808b2 100644
> --- a/dim.rst
> +++ b/dim.rst
> @@ -475,9 +475,13 @@ EXAMPLES
>  
>  Cross-subsystem topic branches
>  ------------------------------
> -So you want to send a pull request to another subsystem? Maintainers will likely
> -get cranky if you ask them to pull a swath of unrelated drm patches, so we'll
> -use a topic branch based upon Linus' tree with only the relevant patches.
> +So you want to send a pull request to another subsystem? Frist, you don't want,

Frist!


Otherwise looks good. For both:

Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

> +it's much simpler to get Acks for merging through a single tree and then maybe
> +later on backmerge. But if it cannot be avoided, read on.
> +
> +Maintainers will likely get cranky if you ask them to pull a swath of unrelated
> +drm patches, so we'll use a topic branch based upon Linus' tree with only the
> +relevant patches.
>  
>  First select a suitable *baseline* for your topic branch. For topic
>  branches shared within the gpu/drm subsystem, base it on the latest




More information about the dim-tools mailing list