From patchwork Thu Jul 20 14:17:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 9855051 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 79DCD602BA for ; Thu, 20 Jul 2017 14:17:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AEDD28676 for ; Thu, 20 Jul 2017 14:17:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FABB286CF; Thu, 20 Jul 2017 14:17:31 +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 F229E28676 for ; Thu, 20 Jul 2017 14:17:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C3926E6A5; Thu, 20 Jul 2017 14:17:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x229.google.com (mail-qt0-x229.google.com [IPv6:2607:f8b0:400d:c0d::229]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4568D6E6AA for ; Thu, 20 Jul 2017 14:17:29 +0000 (UTC) Received: by mail-qt0-x229.google.com with SMTP id 21so24380990qtx.3 for ; Thu, 20 Jul 2017 07:17:29 -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=iLJNyn6Ew0qiqhM1tVZSkR4wvIAeJOhCzROE0jTJovQ=; b=i0lBUsPMK/znWwzvApdha6TIrtuS0f5qgdFRVvoWbmbqB6dzPZP728Q6EdhMIm7YAR 4hTBMJHU8jZBAKdQ7f51braVKYuZ2blp6po4/VNUpg7nMi54ruXQHny+SabFUSTtlyjX hh/YdqxkTsGgzjCzoXHT5cL3uiLHys7Ou0glw= 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=iLJNyn6Ew0qiqhM1tVZSkR4wvIAeJOhCzROE0jTJovQ=; b=KzrHhtButJMOelCOZUQmOO28fc1Paxk3MomnoZpnEBc/FJUVJClFtRpk5EyyiCjNn8 7H4cnzCrixroKM5lG6uSsyIgU4VB84V+SDj96WnaP4YwYdrd0XLVS83U1nv8utSBi67q JVE92OSwiXqDXIJYlRj9LbPsoDhqw7BWUtkdw6neq+LhkKo6kDSrPKfxzzpUowU5TBWU fZnViZZr6eyA8kMdBL/WD1eFF3OxrsB59OVGgejQ3SQ27DpFkZRyBsAlPdiSXr8fodvX yYStRq8L2Qk+k3RYS6DYZRXRsI7YrBHDc/RKLSfUGO+at6ScSbvbe7zoeUv4TBMxVWOy dKTQ== X-Gm-Message-State: AIVw113Z90bMDnOFuZssy4RrldOpsUTT41jwheCV2UBExtzKT1FMbVFz TwCUnwX+7tI9MkCUcDAEbQ== X-Received: by 10.55.54.17 with SMTP id d17mr3557639qka.301.1500560248232; Thu, 20 Jul 2017 07:17:28 -0700 (PDT) Received: from localhost.localdomain (99-45-70-16.lightspeed.rlghnc.sbcglobal.net. [99.45.70.16]) by smtp.gmail.com with ESMTPSA id k50sm1824094qtc.68.2017.07.20.07.17.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Jul 2017 07:17:27 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, daniel.vetter@intel.com, jani.nikula@linux.intel.com Subject: [maintainer-tools PATCH] Add flowchart to help determine appropriate branch Date: Thu, 20 Jul 2017 10:17:07 -0400 Message-Id: <20170720141729.37941-1-seanpaul@chromium.org> X-Mailer: git-send-email 2.14.0.rc0.284.gd933b75aa4-goog Cc: intel-gfx@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch adds a flowchart to the drm-misc documentation to help committers decide which branch is most appropriate for a given patch. Signed-off-by: Sean Paul --- .gitignore | 1 + Makefile | 2 +- drm-misc-commit-flow.dot | 22 ++++++++++++++++++++++ drm-misc.rst | 10 ++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 drm-misc-commit-flow.dot diff --git a/.gitignore b/.gitignore index e2bd6b6..35ed071 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ drm-intel-flow.svg +drm-misc-commit-flow.svg *.html .* *~ diff --git a/Makefile b/Makefile index e079e35..44fcdc9 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ drm-intel.html: drm-intel.rst drm-intel-flow.svg drm-intel-timeline.rst drm-inte sed -i 's/ $@ sed -i 's/ next_0[label="no"]; + is_fix -> in_origin[label="yes"]; + + in_origin -> fixes_0[label="yes"] + in_origin -> is_late[label="no"]; + + is_late -> next_1[label="no"] + is_late -> next_fixes_0[label="yes"] +} diff --git a/drm-misc.rst b/drm-misc.rst index c66ac67..05ccefb 100644 --- a/drm-misc.rst +++ b/drm-misc.rst @@ -73,6 +73,16 @@ updated drm-tip gets rebuilt. If there's a conflict see section on `resolving conflicts when rebuilding drm-tip `_. +Where Do I Apply My Patch? +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Consult this handy flowchart to determine the best branch for your patch. If in +doubt, apply to drm-misc-next or ask your favorite maintainer on IRC. + +.. Note: This requires SVG support in the browser. +.. raw:: html + :file: drm-misc-commit-flow.svg + Merge Timeline ~~~~~~~~~~~~~~