[PATCH] doc: Reword explanation of drm-misc-next-fixes.

[Daniel Vetter]

On Thu, Jan 18, 2018 at 12:41:11PM -0800, Eric Anholt wrote:
> Every rc6, I reread the docs trying to reason about where my patch
> should go (the answer is basically always "drm-misc-fixes").  Reword
> the explanation to clarify the role of drm-misc-next-fixes and
> hopefully point people to drm-misc-fixes.
> 
> Signed-off-by: Eric Anholt <eric at anholt.net>

Applied, thanks.
-Daniel

> ---
>  drm-misc.rst | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drm-misc.rst b/drm-misc.rst
> index 79212fca3449..c08234992266 100644
> --- a/drm-misc.rst
> +++ b/drm-misc.rst
> @@ -51,11 +51,11 @@ cherry-picking is not the default.
>  drm-misc-next-fixes
>  ~~~~~~~~~~~~~~~~~~~
>  
> -This branch is only relevant between rc6 of the current kernel version (X) and
> -rc1 of the next (X+1). This is the feature freeze period mentioned above in the
> -drm-misc-next section. During this time, drm-misc-next will roll over to target
> -kernel version X+2, and drm-misc-fixes will still be on kernel version X, so
> -drm-misc-next-fixes is used for fixes that target X+1.
> +During the time between rc6 of kernel version X and rc1 of X+1,
> +drm-misc-next will be targeting kernel version X+2 and drm-misc-fixes
> +still targets kernel version X.  This branch is for fixes to bugs
> +introduced in the drm-misc-next pull request that was sent for X+1,
> +which aren't present in the drm-misc-fixes branch.
>  
>  See the timeline below for a visualization of patch flow.
>  
> -- 
> 2.15.0
> 
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch