[PATCH 1/2] doc: fix typos in drm-misc guidelines
Jani Nikula
jani.nikula at intel.com
Mon Jan 8 15:04:44 UTC 2018
On Mon, 08 Jan 2018, Gustavo Padovan <gustavo at padovan.org> wrote:
> From: Gustavo Padovan <gustavo.padovan at collabora.com>
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.com>
Ack on both. I forget, do you have push access for this?
BR,
Jani.
> ---
> drm-misc.rst | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drm-misc.rst b/drm-misc.rst
> index c5f5c0171420..db313d0d9be1 100644
> --- a/drm-misc.rst
> +++ b/drm-misc.rst
> @@ -175,7 +175,7 @@ Maintainer's Duties
>
> Maintainers mostly provide services to keep drm-misc running smoothly:
>
> -* Coordinate cross-subsystem depencies and handle topic branches, sending out
> +* Coordinate cross-subsystem dependencies and handle topic branches, sending out
> pull request and merging topic pull requests from other subsystems.
>
> * At least once per week check for pending bugfixes (using ``dim status``) and
> @@ -194,7 +194,7 @@ Maintainers mostly provide services to keep drm-misc running smoothly:
> setting the `upstream` argument for ``dim pull-request`` accordingly.
> Upstream should be warned that they haven't fast-forwarded yet.
>
> -* During the merge-windo blackout, i.e. from -rc6 on until the merge window
> +* During the merge-window blackout, i.e. from -rc6 on until the merge window
> closes with the release of -rc1, try to track `drm-next` with the
> `-next-fixes` branch. Do not advance past -rc1, otherwise the automagic in
> the scripts will push the wrong patches to the linux-next tree.
--
Jani Nikula, Intel Open Source Technology Center
More information about the dim-tools
mailing list