From patchwork Mon Jul 6 14:07:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 50766 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7D0AC218EA for ; Mon, 6 Jul 2015 14:40:36 +0000 (UTC) Received: by wgfk9 with SMTP id k9sf50889975wgf.1 for ; Mon, 06 Jul 2015 07:40:35 -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=W1UyaQYpCYseKLqf/rWJx5PJKwfO6Kp8ZdigrvzlFyk=; b=Kr9QOBpZYRZ0e1e/y4jT81UlateTxkBsfBJJDkn/2dLE+ymLpoXN9FXE3DCZT3jUku S/j+rsJu9GzY4zof5lpvF1ztmrvZJfUXHH/q68Qw3A8W66n7y7PIKWDHtho1MvCfDrP0 SvAEq8yANSx9OHnsFXqLQ8kVNKBh37pu1YIEVRHhVMp+oOnOuuUF94W0WmXW94FGaY/Y 5jdZzkNz1ZuOKIaklrz/ufsCizDnOdkt/kSDFglFE0VSa7C4DikhYwQl1CNRUm7f41uz 5AUrSpZ3mXVkbpJDC40X9a3sicFaXb8C3UQdDiXjrhGg0vWJRRq/IHJsiJrRgsefjGNR DaZg== X-Gm-Message-State: ALoCoQnxlDafSp3ffnUQLGvoZ5BspXVUN5srbOr74C28QBmjlVyVRLH90K/hS5BpsGw7rBRXoIzW X-Received: by 10.180.35.162 with SMTP id i2mr28516238wij.6.1436193635844; Mon, 06 Jul 2015 07:40:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.36 with SMTP id g4ls715976lah.33.gmail; Mon, 06 Jul 2015 07:40:35 -0700 (PDT) X-Received: by 10.112.10.166 with SMTP id j6mr44862558lbb.120.1436193635702; Mon, 06 Jul 2015 07:40:35 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id b5si15420966lbk.87.2015.07.06.07.40.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 07:40:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lagc2 with SMTP id c2so157263357lag.3 for ; Mon, 06 Jul 2015 07:40:35 -0700 (PDT) X-Received: by 10.112.222.133 with SMTP id qm5mr49370571lbc.86.1436193634589; Mon, 06 Jul 2015 07:40:34 -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 hn6csp1767669lbb; Mon, 6 Jul 2015 07:40:32 -0700 (PDT) X-Received: by 10.70.103.10 with SMTP id fs10mr104309638pdb.141.1436191889712; Mon, 06 Jul 2015 07:11:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gz10si29172698pbd.213.2015.07.06.07.11.28; Mon, 06 Jul 2015 07:11:29 -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 S1756183AbbGFOLX (ORCPT + 2 others); Mon, 6 Jul 2015 10:11:23 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:28849 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755751AbbGFOK0 (ORCPT ); Mon, 6 Jul 2015 10:10:26 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t66EAPcR004597 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Jul 2015 14:10:26 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t66EAPvu026871 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 6 Jul 2015 14:10:25 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t66EAPEQ032232; Mon, 6 Jul 2015 14:10:25 GMT Received: from lappy.hsd1.nh.comcast.net (/10.154.116.12) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 06 Jul 2015 07:10:25 -0700 From: Sasha Levin To: stable@vger.kernel.org, stable-commits@vger.kernel.org Cc: sasha.levin@oracle.com Subject: [PATCH 3.18 077/195] stable: Update documentation to clarify preferred procedure Date: Mon, 6 Jul 2015 10:07:33 -0400 Message-Id: <1436191771-13828-78-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1436191771-13828-1-git-send-email-sasha.levin@oracle.com> References: <1436191771-13828-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] 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.42 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 [ 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