[PULL] drm-misc-fixes
diff mbox

Message ID 20170528100813.GA5611@wunner.de
State New
Headers show

Commit Message

Lukas Wunner May 28, 2017, 10:08 a.m. UTC
On Fri, May 26, 2017 at 08:36:45AM +0200, Daniel Vetter wrote:
> On Thu, May 25, 2017 at 7:44 PM, Sean Paul <seanpaul@chromium.org> wrote:
> > The pull is noisy because it includes -rc2.
> 
> dim has you covered for this, in case you've rolled forward but Dave
> hasn't yet, you can regenerate against linus upstream branch for a
> cleaner pull (but still warn Dave ofc):
> 
> $ dim pull-request drm-misc-next origin/master

Is it worth documenting this?  If so, below is a suggestion.
Feel free to rephrase as you see fit.

Thanks,

Lukas

-- >8 --
Subject: [PATCH] drm-misc: Document recommended base for -fixes pulls

Summarize the following discussion on dri-devel:

   "dim has you covered for this, in case you've rolled forward but Dave
    hasn't yet, you can regenerate against linus upstream branch for a
    cleaner pull (but still warn Dave ofc):
    $ dim pull-request drm-misc-next origin/master" (Daniel)

   "FWIW this is what I've always done with drm-intel-fixes." (Jani)

   "As long as I'm warned in the pull request I often fast forward to
    the base if my tree is clean, just to avoid the pull request having
    noise in it." (Dave)

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
---
 drm-misc.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Daniel Vetter May 29, 2017, 6:56 a.m. UTC | #1
On Sun, May 28, 2017 at 12:08:13PM +0200, Lukas Wunner wrote:
> On Fri, May 26, 2017 at 08:36:45AM +0200, Daniel Vetter wrote:
> > On Thu, May 25, 2017 at 7:44 PM, Sean Paul <seanpaul@chromium.org> wrote:
> > > The pull is noisy because it includes -rc2.
> > 
> > dim has you covered for this, in case you've rolled forward but Dave
> > hasn't yet, you can regenerate against linus upstream branch for a
> > cleaner pull (but still warn Dave ofc):
> > 
> > $ dim pull-request drm-misc-next origin/master
> 
> Is it worth documenting this?  If so, below is a suggestion.
> Feel free to rephrase as you see fit.

Great idea, thanks for the patch. Applied&pushed.
-Daniel

> 
> Thanks,
> 
> Lukas
> 
> -- >8 --
> Subject: [PATCH] drm-misc: Document recommended base for -fixes pulls
> 
> Summarize the following discussion on dri-devel:
> 
>    "dim has you covered for this, in case you've rolled forward but Dave
>     hasn't yet, you can regenerate against linus upstream branch for a
>     cleaner pull (but still warn Dave ofc):
>     $ dim pull-request drm-misc-next origin/master" (Daniel)
> 
>    "FWIW this is what I've always done with drm-intel-fixes." (Jani)
> 
>    "As long as I'm warned in the pull request I often fast forward to
>     the base if my tree is clean, just to avoid the pull request having
>     noise in it." (Dave)
> 
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Cc: Dave Airlie <airlied@redhat.com>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
> ---
>  drm-misc.rst | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drm-misc.rst b/drm-misc.rst
> index d56c3c7..c66ac67 100644
> --- a/drm-misc.rst
> +++ b/drm-misc.rst
> @@ -178,6 +178,14 @@ Maintainers mostly provide services to keep drm-misc running smoothly:
>    keep it current. We try to avoid backmerges for bugfix branches, and rebasing
>    isn't an option with multiple committers.
>  
> +* Pull requests become noisy if `-fixes` has been fast-forwarded to Linus'
> +  latest -rc tag but drm-upstream hasn't done the same yet: The shortlog
> +  will contain not just the queued fixes but also anything else that has
> +  landed in Linus' tree in the meantime. The best practice is then to base
> +  the pull request on Linus' master branch (rather than drm-upstream) by
> +  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
>    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
> -- 
> 2.11.0
>

Patch
diff mbox

diff --git a/drm-misc.rst b/drm-misc.rst
index d56c3c7..c66ac67 100644
--- a/drm-misc.rst
+++ b/drm-misc.rst
@@ -178,6 +178,14 @@  Maintainers mostly provide services to keep drm-misc running smoothly:
   keep it current. We try to avoid backmerges for bugfix branches, and rebasing
   isn't an option with multiple committers.
 
+* Pull requests become noisy if `-fixes` has been fast-forwarded to Linus'
+  latest -rc tag but drm-upstream hasn't done the same yet: The shortlog
+  will contain not just the queued fixes but also anything else that has
+  landed in Linus' tree in the meantime. The best practice is then to base
+  the pull request on Linus' master branch (rather than drm-upstream) by
+  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
   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