From patchwork Mon Apr 10 16:05:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 9673105 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 BE07D60381 for ; Mon, 10 Apr 2017 16:05:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C9DE283E1 for ; Mon, 10 Apr 2017 16:05:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9113128469; Mon, 10 Apr 2017 16:05:49 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham 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 E5E7F28415 for ; Mon, 10 Apr 2017 16:05:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 510456E3B2; Mon, 10 Apr 2017 16:05:48 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qt0-x233.google.com (mail-qt0-x233.google.com [IPv6:2607:f8b0:400d:c0d::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id 31C9C6E3B2 for ; Mon, 10 Apr 2017 16:05:47 +0000 (UTC) Received: by mail-qt0-x233.google.com with SMTP id n46so35244200qta.2 for ; Mon, 10 Apr 2017 09:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=MiSRRC2z9JdZ71wkqgtl8q7SF/Ze1SFRu8XZnZrDRcs=; b=BhXoZ1G1CAjyq8ODnKHiE81m3dOpnyIhN+SXB+srfDDmmogBI8nyc+Bw6GH1O66taC +wsrNFywItb8RnTpu/FlaAgtAablYRkGSKs+loJoMpp0UDSniLgsyrTvpkJXNJBEXRgz FER1t8BizlDjnuQXUlxnw3qgTcuOX8cRi10xk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MiSRRC2z9JdZ71wkqgtl8q7SF/Ze1SFRu8XZnZrDRcs=; b=AueYMJX+/s/OEJJiMJGSQ2x2gAvSsXe7AxJmidBxBZR0Hk1QUrPQ7CCvu2EwvJVCN0 PTS+Qs9uxhJWzCyJYHx9z/cQjJRwU4+U58mZZiMAisk8wl5jBN8xB7j+V37I2M9olUyD BFYOqyCcYg65jy5Hi2X6ensiOptREHMovVIC++g9GrNai9d0bSukgDyAixmkkJhu/Jjy wnSBuqhhuIbUTYG1FBKh23bcbFl+cDJyrXhxRM4NxN7Vwzf1e2jtdMSvUQmPvUlq8wBH rdREoTowHetBq1FukDiXjJV5rOk3g8hi3NdP7OX9sz5qy3TfgbIpp4jmncWK46nvyOiZ tgRA== X-Gm-Message-State: AN3rC/4D+7i+93pRqxr7992pLT0Dz+FSkNuirp+QdQflpeymhbmSTvTOeUfqhG/58GjrAA3U X-Received: by 10.200.49.123 with SMTP id h56mr15571558qtb.172.1491840345636; Mon, 10 Apr 2017 09:05:45 -0700 (PDT) Received: from boxwood.roam.corp.google.com (cpe-75-189-128-87.nc.res.rr.com. [75.189.128.87]) by smtp.gmail.com with ESMTPSA id o23sm9059601qko.12.2017.04.10.09.05.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Apr 2017 09:05:44 -0700 (PDT) From: Sean Paul To: intel-gfx@lists.freedesktop.org, daniel.vetter@linux.intel.com, jani.nikula@linux.intel.com Date: Mon, 10 Apr 2017 12:05:43 -0400 Message-Id: <20170410160543.3726-1-seanpaul@chromium.org> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog Subject: [Intel-gfx] [maintainer-tools PATCH] dim: Expand drm-misc branch explanations 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Add a bit more colour to the -misc branch explanations, and add a merge timeline similar to the chart used in drm-intel. Signed-off-by: Sean Paul Reviewed-by: Daniel Stone --- I've compiled the with this patch and hosted the output here: https://people.freedesktop.org/~seanpaul/drm-misc.html Makefile | 5 ++++ drm-misc-timeline.json | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ drm-misc-timeline.rst | 29 ++++++++++++++++++++++ drm-misc.rst | 35 +++++++++++++++++++------- 4 files changed, 127 insertions(+), 9 deletions(-) create mode 100644 drm-misc-timeline.json create mode 100644 drm-misc-timeline.rst diff --git a/Makefile b/Makefile index 4291049..e079e35 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,11 @@ drm-intel.html: drm-intel.rst drm-intel-flow.svg drm-intel-timeline.rst drm-inte rst2html $< > $@ sed -i 's/ $@ + sed -i 's/2', 'b~>3', 'c~>4', 'd~>5', 'e~>6', 'f~>8', + /* -next to linus */ + 'g~>1 feature merge', 'h~>0 feature merge', + /* misc-fixes to -next */ + 'i~>a', 'j~>b', 'k~>c', 'l~>d', 'm~>e', 'n~>f', + /* misc-next-fixes to -next */ + 'o~>g', 'q~>p', + /* misc-next to -next */ + 'r~>s', 'x~>t', 'y~>u', 'z~>v', ';~>w', ':~>"' + + ], + + config: { hscale:3 }, +} + diff --git a/drm-misc-timeline.rst b/drm-misc-timeline.rst new file mode 100644 index 0000000..6972777 --- /dev/null +++ b/drm-misc-timeline.rst @@ -0,0 +1,29 @@ +.. raw:: html + + + + + diff --git a/drm-misc.rst b/drm-misc.rst index 45ea795..caba8dc 100644 --- a/drm-misc.rst +++ b/drm-misc.rst @@ -38,20 +38,26 @@ drm-misc-next This is the main feature branch where most of the patches land. This branch is always open to "hide" the merge window from developers. To avoid upsetting -linux-next and causing mayhem in the merge window in general no pull requests -are sent to upstream 1-2 weeks before the merge window opens. Outside of that -feature freeze period pull requests are sent to upstream roughly every week, to -avoid too much coordination pains. - -If you're unsure apply your patch here, it can always be cherry-picked to one of -the -fixes patches later on. But in contrast to the drm-intel flow +linux-next and causing mayhem in the merge window, in general no pull requests +are sent to upstream after rc6 of the current kernel release. Outside of that +feature freeze period, pull requests are sent to upstream roughly every 1-2 +weeks, to avoid too much coordination pains. See the timeline below for a +visualization of patch flow. + +If you're unsure, apply your patch here, it can always be cherry-picked to one +of the -fixes branches later on. But in contrast to the drm-intel flow cherry-picking is not the default. drm-misc-next-fixes ~~~~~~~~~~~~~~~~~~~ -This is for bugfixes to drm-misc-next after feature freeze, but before -rc1 is -tagged. +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. + +See the timeline below for a visualization of patch flow. drm-misc-fixes ~~~~~~~~~~~~~~ @@ -67,6 +73,17 @@ updated drm-tip gets rebuilt. If there's a conflict see section on `resolving conflicts when rebuilding drm-tip `_. +Merge Timeline +~~~~~~~~~~~~~~ + +This chart describes the merge timelines for various branches in terms of one +kernel release cycle. Worth noting is that we're working on two or three kernel +releases at the same time. Big features take a long time to hit a kernel +release. There are no fast paths. + +.. include:: drm-misc-timeline.rst + + Merge Criteria ==============