From patchwork Sat Jul 4 03:01:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 50651 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9CC48214B3 for ; Sat, 4 Jul 2015 03:04:51 +0000 (UTC) Received: by lagx9 with SMTP id x9sf32940341lag.2 for ; Fri, 03 Jul 2015 20:04:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=tTogmebPQGP1tqDq7Y2ViX/4snEh7N4qIHVZBnRe1YA=; b=hEvsbsO2ZHpdjr+MM+bGpMz6DHKXnIui+pgpGCocRlTvdPvdNgX4naVp/sSledkiRz S8t4U7MccPmTqQmz51gAZksg7vKXss/EvVdUH34UX1LSLAxHELggD9DNqVU6od68OhHB UlzRMFMSCzWvgxkQCXs/7zmJRIysYGDKRuJ6SjhhOclnaKoZ5gW/ER09ZWmSOQg0YDG0 aYZHGXHUW2Phcya7Ck3OnUQOLuaiWhd1lIIdI6I6svzc3AzvaAIc8L2I/gdjHmuFIy3x Zbt+4A5IDbaTi7nf9S5T3H82DTzECWaiKFu5uGUQFnKICv8H9wV2yqbWOk5zRGrjJYXt +QRw== X-Gm-Message-State: ALoCoQmeFrY/ch8frY/u432IpDt06yq9FD3t/GTbDGSvb8pc//yDQcUuensWMTZqx9MTrf6xKqyF X-Received: by 10.152.88.70 with SMTP id be6mr24141377lab.9.1435979090652; Fri, 03 Jul 2015 20:04:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.2 with SMTP id t2ls552852laz.8.gmail; Fri, 03 Jul 2015 20:04:50 -0700 (PDT) X-Received: by 10.152.21.37 with SMTP id s5mr37549529lae.2.1435979090410; Fri, 03 Jul 2015 20:04:50 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id s2si8819108lal.142.2015.07.03.20.04.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jul 2015 20:04:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by laar3 with SMTP id r3so101639121laa.0 for ; Fri, 03 Jul 2015 20:04:50 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr38297624lay.72.1435979089957; Fri, 03 Jul 2015 20:04:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp375088lbb; Fri, 3 Jul 2015 20:04:48 -0700 (PDT) X-Received: by 10.66.100.162 with SMTP id ez2mr82888768pab.10.1435979060178; Fri, 03 Jul 2015 20:04:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yw2si17068206pbc.95.2015.07.03.20.04.19; Fri, 03 Jul 2015 20:04:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754653AbbGDDES (ORCPT + 2 others); Fri, 3 Jul 2015 23:04:18 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:21983 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754888AbbGDDEI (ORCPT ); Fri, 3 Jul 2015 23:04:08 -0400 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t64345fm010689 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 4 Jul 2015 03:04:06 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t64345wY019620 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Sat, 4 Jul 2015 03:04:05 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t6433sYH017595; Sat, 4 Jul 2015 03:03:59 GMT Received: from lappy.hsd1.nh.comcast.net (/10.154.162.71) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 03 Jul 2015 20:03:54 -0700 From: Sasha Levin To: stable@vger.kernel.org, stable-commits@vger.kernel.org Cc: Christoffer Dall , Jonathan Corbet , Sasha Levin Subject: [added to the 3.18 stable tree] stable: Update documentation to clarify preferred procedure Date: Fri, 3 Jul 2015 23:01:19 -0400 Message-Id: <1435978997-14393-30-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1435978997-14393-1-git-send-email-sasha.levin@oracle.com> References: <1435978997-14393-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Christoffer Dall This patch has been added to the 3.18 stable tree. If you have any objections, please let us know. =============== [ Upstream commit bde1b29420d71a17d87332db8e20229f251d6c14 ] Clearly specify that "Cc: stable@vger.kernel.org" is strongly preferred so that developers understand that the other options should only be used when absolutely required. Also specify how upstream commit ids should be referenced in patches submitted directly to stable (I gathered this from looking at the stable archives), and specify that any modified patches for stable should be clearly documented in the patch description. Signed-off-by: Christoffer Dall Signed-off-by: Jonathan Corbet Signed-off-by: Sasha Levin --- Documentation/stable_kernel_rules.txt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt index 58d0ac4..3049a61 100644 --- a/Documentation/stable_kernel_rules.txt +++ b/Documentation/stable_kernel_rules.txt @@ -59,11 +59,20 @@ For all other submissions, choose one of the following procedures: changelog of your submission, as well as the kernel version you wish it to be applied to. -Option 1 is probably the easiest and most common. Options 2 and 3 are more -useful if the patch isn't deemed worthy at the time it is applied to a public -git tree (for instance, because it deserves more regression testing first). -Option 3 is especially useful if the patch needs some special handling to apply -to an older kernel (e.g., if API's have changed in the meantime). +Option 1 is *strongly* preferred, is the easiest and most common. Options 2 and +3 are more useful if the patch isn't deemed worthy at the time it is applied to +a public git tree (for instance, because it deserves more regression testing +first). Option 3 is especially useful if the patch needs some special handling +to apply to an older kernel (e.g., if API's have changed in the meantime). + +Note that for Option 3, if the patch deviates from the original upstream patch +(for example because it had to be backported) this must be very clearly +documented and justified in the patch description. + +The upstream commit ID must be specified with a separate line above the commit +text, like this: + + commit upstream. Additionally, some patches submitted via Option 1 may have additional patch prerequisites which can be cherry-picked. This can be specified in the following