From patchwork Wed Dec 23 13:20:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 7912351 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A56949F349 for ; Wed, 23 Dec 2015 13:20:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8EBF02046F for ; Wed, 23 Dec 2015 13:20:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 513F72045B for ; Wed, 23 Dec 2015 13:20:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7351D6E63E; Wed, 23 Dec 2015 05:20:48 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id B218D6E63F for ; Wed, 23 Dec 2015 05:20:47 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP; 23 Dec 2015 05:20:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,468,1444719600"; d="scan'208";a="879744319" Received: from dgradl-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.40.71]) by fmsmga002.fm.intel.com with ESMTP; 23 Dec 2015 05:20:44 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Wed, 23 Dec 2015 15:20:18 +0200 Message-Id: <1450876818-12157-2-git-send-email-jani.nikula@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450876818-12157-1-git-send-email-jani.nikula@intel.com> References: <1450876818-12157-1-git-send-email-jani.nikula@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: jani.nikula@intel.com Subject: [Intel-gfx] [maintainer-tools PATCH 2/2] drm-intel: document new fixes flow 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jani Nikula --- drm-intel-flow.dot | 9 +++--- drm-intel.rst | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 79 insertions(+), 11 deletions(-) diff --git a/drm-intel-flow.dot b/drm-intel-flow.dot index 0a16a915a49c..cfee83872c37 100644 --- a/drm-intel-flow.dot +++ b/drm-intel-flow.dot @@ -77,8 +77,7 @@ strict digraph "drm-intel" { "intel-gfx" [label="intel-gfx mailing list"] "internal" [label="internal mailing list"] - "fixes for current" -> "intel-gfx" - "fixes for next" -> "intel-gfx" + "fixes" -> "intel-gfx" "feature patches" -> "intel-gfx" "embargoed patches" -> "internal" @@ -86,7 +85,7 @@ strict digraph "drm-intel" { "internal" -> "drm-intel-internal" [label="maintainers pick\nalways open"] - "intel-gfx" -> "drm-intel-next-queued" [label="maintainers pick\nalways open"] - "intel-gfx" -> "drm-intel-fixes" [label="maintainers pick\nrc1..rcN of current"] - "intel-gfx" -> "drm-intel-next-fixes" [label="maintainers pick\n~rc5..release of current"] + "intel-gfx" -> "drm-intel-next-queued" [label="committers/maintainers pick\nalways open"] + "drm-intel-next-queued" -> "drm-intel-fixes" [label="maintainers cherry-pick\nrc1..rcN of current" color=blue] + "drm-intel-next-queued" -> "drm-intel-next-fixes" [label="maintainers cherry-pick\n~rc5..release of current" color=blue] } diff --git a/drm-intel.rst b/drm-intel.rst index 66654899fed2..0e774047b1b8 100644 --- a/drm-intel.rst +++ b/drm-intel.rst @@ -93,7 +93,8 @@ drm-intel-next-fixes (aka "dinf") ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This branch contains drm/i915 specific fixes to drm-next after the drm/i915 -features have been merged there. +features have been merged there. Fixes are first applied to +drm-intel-next-queued, and cherry-picked to drm-intel-next-fixes. Pull requests to Dave are sent as needed, with no particular schedule. @@ -101,13 +102,14 @@ drm-intel-fixes (aka "-fixes") ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This branch contains fixes to Linus' tree after drm-next has been merged during -the merge window. The fixes are merged through drm-fixes. Valid from -rc1 to the -kernel release. +the merge window. Fixes are first applied to drm-intel-next-queued, and +cherry-picked to drm-intel-fixes. The fixes are then merged through drm-fixes. +Valid from -rc1 to the kernel release. Usually Linus releases each -rc on a Sunday, and drm-intel-fixes gets rebased on -that the following Monday. The pull request to Dave for new fixes is typically -sent on the following Thursday. This is repeated until final release of the -kernel. +that the following Monday. Usually this is a fast-forward. The pull request to +Dave for new fixes is typically sent on the following Thursday. This is repeated +until final release of the kernel. This is the fastest path to getting fixes to Linus' tree. It is generally for the regressions, cc:stable, black screens, GPU hangs only, and should pretty @@ -130,6 +132,73 @@ flow of the commits to drm-upstream and Linus' tree. Legend: Green = Linus. Red = drm-upstream. Blue = drm-intel. Black = patches. +Features +-------- + +Features are picked up and pushed to drm-intel-next-queued by committers and +maintainers. See committer guidelines below for details. + +Fixes +----- + +Fixes are picked up and pushed to drm-intel-next-queued by committers and +maintainers, just like any other patches. This is to ensure fixes are pushed in +a timely manner. Fixes that are relevant for stable, current development +kernels, or drm-next, will be cherry-picked by maintainers to drm-intel-fixes or +drm-intel-next-fixes. + +To make this work, patches should be labeled as fixes (see below), and extra +care should be put into making fixes the first patches in series, not depending +on preparatory work or cleanup. + +Labeling Fixes Before Pushing +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +To label fixes that should be cherry-picked to the current -rc development +kernel or drm-next, the commit message should contain either: + + Cc: drm-intel-fixes@lists.freedesktop.org + +or, if the fix is relevant for a released kernel, + + Cc: stable@vger.kernel.org + +If the Cc: was forgotten, you can still reply to the list with that, just like +any other tags, and they should be picked up by whoever pushes the patch. + +The maintainers will cherry-pick labeled patches from drm-intel-next-queued to +the appropriate branches. + +If possible, the commit message should also contain a Fixes: tag as described in +`Documentation/SubmittingPatches +`_ +to aid the maintainers in identifying the right branch. + +Requesting Fixes Cherry-Pick Afterwards +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +It's not uncommon for a patch to have been committed before it's identified as a +fix needing to be backported. + +If the patch is already in Linus' tree, please follow `stable kernel rules +`_. + +Otherwise, send an email to intel-gfx@lists.freedesktop.org and +drm-intel-fixes@lists.freedesktop.org containing the subject of the patch, the +commit id, why you think it should be applied, and what branch you wish it to be +applied to. + +Replying to the original patch is also fine, but please do remember to add Cc: +drm-intel-fixes@lists.freedesktop.org and the commit id. + +Alternatively, if the cherry-pick has conflicts, please send a patch to +intel-gfx@lists.freedesktop.org and drm-intel-fixes@lists.freedesktop.org with +subject prefix "drm-intel-fixes PATCH" or "drm-intel-next-fixes PATCH" depending +on the branch. Please add 'git cherry-pick -x' style annotation above your +Signed-off-by: line in the commit message: + + (cherry picked from commit 0bff4858653312a10c83709e0009c3adb87e6f1e) + Merge Timeline ==============