From patchwork Sun May 28 10:08:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Wunner X-Patchwork-Id: 9752261 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 220DC60361 for ; Sun, 28 May 2017 10:08:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30CC61FF35 for ; Sun, 28 May 2017 10:08:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2475728455; Sun, 28 May 2017 10:08:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D9C631FF35 for ; Sun, 28 May 2017 10:08:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B85489C89; Sun, 28 May 2017 10:07:55 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mailout3.hostsharing.net (mailout3.hostsharing.net [176.9.242.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE73D89C63; Sun, 28 May 2017 10:07:53 +0000 (UTC) Received: from h08.hostsharing.net (h08.hostsharing.net [83.223.95.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mailout3.hostsharing.net (Postfix) with ESMTPS id C8EC41018922A; Sun, 28 May 2017 12:07:59 +0200 (CEST) Received: from localhost (5-38-90-81.adsl.cmo.de [81.90.38.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by h08.hostsharing.net (Postfix) with ESMTPSA id D81E56260666; Sun, 28 May 2017 12:07:47 +0200 (CEST) Date: Sun, 28 May 2017 12:08:13 +0200 From: Lukas Wunner To: Daniel Vetter Message-ID: <20170528100813.GA5611@wunner.de> References: <20170525174403.6wjgnrzarucitzfo@art_vandelay> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.6.1 (2016-04-27) Cc: intel-gfx , dri-devel Subject: Re: [Intel-gfx] [PULL] drm-misc-fixes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP On Fri, May 26, 2017 at 08:36:45AM +0200, Daniel Vetter wrote: > On Thu, May 25, 2017 at 7:44 PM, Sean Paul 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 Cc: Jani Nikula Cc: Sean Paul Cc: Dave Airlie Signed-off-by: Lukas Wunner --- 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