Re: [PATCH] drm/doc: Document feature merge deadlines

2017-03-22 Thread Daniel Vetter 
On Tue, Mar 21, 2017 at 03:38:26PM -0400, Sean Paul wrote:
> On Tue, Mar 21, 2017 at 04:52:28PM +0100, Daniel Vetter wrote:
> > The discussion pretty much concluded without objections, let's
> > document what we agreed on.
> > 
> > Cc'ing linux-doc for the new tag in Documentation/process/index.rst.
> > 
> > Cc: Jonathan Corbet 
> > Cc: linux-...@vger.kernel.org
> > Cc: Dave Airlie 
> > Cc: Sean Paul 
> > Cc: Jani Nikula 
> > Cc: Alex Deucher 
> > Cc: Lukas Wunner 
> > Signed-off-by: Daniel Vetter 
> 
> Reviewed-by: Sean Paul 

Dave also acked this on irc, so applied to drm-misc-next.
-Daniel

> 
> > ---
> >  Documentation/gpu/introduction.rst | 25 +
> >  Documentation/process/index.rst|  1 +
> >  2 files changed, 26 insertions(+)
> > 
> > diff --git a/Documentation/gpu/introduction.rst 
> > b/Documentation/gpu/introduction.rst
> > index 1f8bd5ef5f9d..05a82bdfbca4 100644
> > --- a/Documentation/gpu/introduction.rst
> > +++ b/Documentation/gpu/introduction.rst
> > @@ -60,3 +60,28 @@ checkpatch or sparse. We welcome such contributions.
> >  
> >  Anyone looking to kick it up a notch can find a list of janitorial tasks on
> >  the :ref:`TODO list `.
> > +
> > +Contribution Process
> > +
> > +
> > +Mostly the DRM subsystem works like any other kernel subsystem, see 
> > :ref:`the
> > +main process guidelines and documentation ` for how things 
> > work.
> > +Here we just document some of the specialities of the GPU subsystem.
> > +
> > +Feature Merge Deadlines
> > +---
> > +
> > +All feature work must be in the linux-next tree by the -rc6 release of the
> > +current release cycle, otherwise they must be postponed and can't reach 
> > the next
> > +merge window. All patches must have landed in the drm-next tree by latest 
> > -rc7,
> > +but if your branch is not in linux-next then this must have happened by 
> > -rc6
> > +already.
> > +
> > +After that point only bugfixes (like after the upstream merge window has 
> > closed
> > +with the -rc1 release) are allowed. No new platform enabling or new 
> > drivers are
> > +allowed.
> > +
> > +This means that there's a blackout-period of about one month where feature 
> > work
> > +can't be merged. The recommended way to deal with that is having a -next 
> > tree
> > +that's always open, but making sure to not feed it into linux-next during 
> > the
> > +blackout period. As an example, drm-misc works like that.
> > diff --git a/Documentation/process/index.rst 
> > b/Documentation/process/index.rst
> > index 10aa6920709a..82fc399fcd33 100644
> > --- a/Documentation/process/index.rst
> > +++ b/Documentation/process/index.rst
> > @@ -3,6 +3,7 @@
> > \renewcommand\thesection*
> > \renewcommand\thesubsection*
> >  
> > +.. _process_index:
> >  
> >  Working with the kernel development community
> >  =
> > -- 
> > 2.11.0
> 
> -- 
> Sean Paul, Software Engineer, Google / Chromium OS

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/doc: Document feature merge deadlines

2017-03-21 Thread Sean Paul 
On Tue, Mar 21, 2017 at 04:52:28PM +0100, Daniel Vetter wrote:
> The discussion pretty much concluded without objections, let's
> document what we agreed on.
> 
> Cc'ing linux-doc for the new tag in Documentation/process/index.rst.
> 
> Cc: Jonathan Corbet 
> Cc: linux-...@vger.kernel.org
> Cc: Dave Airlie 
> Cc: Sean Paul 
> Cc: Jani Nikula 
> Cc: Alex Deucher 
> Cc: Lukas Wunner 
> Signed-off-by: Daniel Vetter 

Reviewed-by: Sean Paul 

> ---
>  Documentation/gpu/introduction.rst | 25 +
>  Documentation/process/index.rst|  1 +
>  2 files changed, 26 insertions(+)
> 
> diff --git a/Documentation/gpu/introduction.rst 
> b/Documentation/gpu/introduction.rst
> index 1f8bd5ef5f9d..05a82bdfbca4 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -60,3 +60,28 @@ checkpatch or sparse. We welcome such contributions.
>  
>  Anyone looking to kick it up a notch can find a list of janitorial tasks on
>  the :ref:`TODO list `.
> +
> +Contribution Process
> +
> +
> +Mostly the DRM subsystem works like any other kernel subsystem, see :ref:`the
> +main process guidelines and documentation ` for how things 
> work.
> +Here we just document some of the specialities of the GPU subsystem.
> +
> +Feature Merge Deadlines
> +---
> +
> +All feature work must be in the linux-next tree by the -rc6 release of the
> +current release cycle, otherwise they must be postponed and can't reach the 
> next
> +merge window. All patches must have landed in the drm-next tree by latest 
> -rc7,
> +but if your branch is not in linux-next then this must have happened by -rc6
> +already.
> +
> +After that point only bugfixes (like after the upstream merge window has 
> closed
> +with the -rc1 release) are allowed. No new platform enabling or new drivers 
> are
> +allowed.
> +
> +This means that there's a blackout-period of about one month where feature 
> work
> +can't be merged. The recommended way to deal with that is having a -next tree
> +that's always open, but making sure to not feed it into linux-next during the
> +blackout period. As an example, drm-misc works like that.
> diff --git a/Documentation/process/index.rst b/Documentation/process/index.rst
> index 10aa6920709a..82fc399fcd33 100644
> --- a/Documentation/process/index.rst
> +++ b/Documentation/process/index.rst
> @@ -3,6 +3,7 @@
>   \renewcommand\thesection*
>   \renewcommand\thesubsection*
>  
> +.. _process_index:
>  
>  Working with the kernel development community
>  =
> -- 
> 2.11.0

-- 
Sean Paul, Software Engineer, Google / Chromium OS
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH] drm/doc: Document feature merge deadlines

2017-03-21 Thread Daniel Vetter 
The discussion pretty much concluded without objections, let's
document what we agreed on.

Cc'ing linux-doc for the new tag in Documentation/process/index.rst.

Cc: Jonathan Corbet 
Cc: linux-...@vger.kernel.org
Cc: Dave Airlie 
Cc: Sean Paul 
Cc: Jani Nikula 
Cc: Alex Deucher 
Cc: Lukas Wunner 
Signed-off-by: Daniel Vetter 
---
 Documentation/gpu/introduction.rst | 25 +
 Documentation/process/index.rst|  1 +
 2 files changed, 26 insertions(+)

diff --git a/Documentation/gpu/introduction.rst 
b/Documentation/gpu/introduction.rst
index 1f8bd5ef5f9d..05a82bdfbca4 100644
--- a/Documentation/gpu/introduction.rst
+++ b/Documentation/gpu/introduction.rst
@@ -60,3 +60,28 @@ checkpatch or sparse. We welcome such contributions.
 
 Anyone looking to kick it up a notch can find a list of janitorial tasks on
 the :ref:`TODO list `.
+
+Contribution Process
+
+
+Mostly the DRM subsystem works like any other kernel subsystem, see :ref:`the
+main process guidelines and documentation ` for how things work.
+Here we just document some of the specialities of the GPU subsystem.
+
+Feature Merge Deadlines
+---
+
+All feature work must be in the linux-next tree by the -rc6 release of the
+current release cycle, otherwise they must be postponed and can't reach the 
next
+merge window. All patches must have landed in the drm-next tree by latest -rc7,
+but if your branch is not in linux-next then this must have happened by -rc6
+already.
+
+After that point only bugfixes (like after the upstream merge window has closed
+with the -rc1 release) are allowed. No new platform enabling or new drivers are
+allowed.
+
+This means that there's a blackout-period of about one month where feature work
+can't be merged. The recommended way to deal with that is having a -next tree
+that's always open, but making sure to not feed it into linux-next during the
+blackout period. As an example, drm-misc works like that.
diff --git a/Documentation/process/index.rst b/Documentation/process/index.rst
index 10aa6920709a..82fc399fcd33 100644
--- a/Documentation/process/index.rst
+++ b/Documentation/process/index.rst
@@ -3,6 +3,7 @@
\renewcommand\thesection*
\renewcommand\thesubsection*
 
+.. _process_index:
 
 Working with the kernel development community
 =
-- 
2.11.0

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel