From patchwork Wed May 13 20:01:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 48464 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6DB6C2121F for ; Wed, 13 May 2015 20:01:10 +0000 (UTC) Received: by layy10 with SMTP id y10sf12832259lay.0 for ; Wed, 13 May 2015 13:01:09 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=tVpwhYijToE1OkNhfNo1fE9kIaiZD7T01UodTg5y9ck=; b=UdVKvNHg7u4yB/OqzH0dfoFsYZdQmOrxhJjahHXwlSk61OQeC53uduw+nSmEs2BhO0 e9cOAZq1XXWGOxOgfgs/bhphL+tcK3ixfcISsNz8ZZEqY+473kzK2jL9EBGxKPwo/bIQ pDz0/eoGe6gErPjrQBy/ZPsYzX7gr9S7tFwwmFRaRriexs0dneK79kw3LXM3+UYCfv1P /Q7C1xcZ3iyHzQk7sAhFxMX076V3NiB+kmmiAkubX/onfBG+AkjLXXtxWu68XeQyPDC2 f+ZGvOB5j7FZ7BGwhb2TMtLo2J75jirc3CTjqUEpFfpQZrNGqEfFk3LijxzW1Fv3yQ3r xY6A== X-Gm-Message-State: ALoCoQlWFbx+6Yp6E1l1BizTxzWBmMrmiMywiVw7ncGD16gKYXMWpX5mKx919liSBH2qcqSFT0T8 X-Received: by 10.194.179.42 with SMTP id dd10mr374019wjc.7.1431547269331; Wed, 13 May 2015 13:01:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.98 with SMTP id u2ls278436lae.84.gmail; Wed, 13 May 2015 13:01:09 -0700 (PDT) X-Received: by 10.112.56.42 with SMTP id x10mr400868lbp.123.1431547269139; Wed, 13 May 2015 13:01:09 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id ay16si13031521lab.32.2015.05.13.13.01.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 May 2015 13:01:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by laat2 with SMTP id t2so38664930laa.1 for ; Wed, 13 May 2015 13:01:09 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr416684lac.41.1431547269003; Wed, 13 May 2015 13:01:09 -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 hn6csp742996lbb; Wed, 13 May 2015 13:01:07 -0700 (PDT) X-Received: by 10.70.89.199 with SMTP id bq7mr1055848pdb.168.1431547267156; Wed, 13 May 2015 13:01:07 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kc8si28500378pbc.130.2015.05.13.13.01.06; Wed, 13 May 2015 13:01:07 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965518AbbEMUBD (ORCPT + 2 others); Wed, 13 May 2015 16:01:03 -0400 Received: from mail-la0-f54.google.com ([209.85.215.54]:33940 "EHLO mail-la0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965515AbbEMUBA (ORCPT ); Wed, 13 May 2015 16:01:00 -0400 Received: by laat2 with SMTP id t2so38658466laa.1 for ; Wed, 13 May 2015 13:00:59 -0700 (PDT) X-Received: by 10.112.42.16 with SMTP id j16mr433316lbl.98.1431547259048; Wed, 13 May 2015 13:00:59 -0700 (PDT) Received: from localhost.localdomain (188-178-240-98-static.dk.customer.tdc.net. [188.178.240.98]) by mx.google.com with ESMTPSA id gn6sm5353556lbc.28.2015.05.13.13.00.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 May 2015 13:00:58 -0700 (PDT) From: Christoffer Dall To: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, stable@vger.kernel.org, corbet@lwn.net, gregkh@linuxfoundation.org Cc: Christoffer Dall Subject: [PATCH] stable: Update documentation to clarify preferred procedure Date: Wed, 13 May 2015 22:01:07 +0200 Message-Id: <1431547267-24375-1-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty 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: christoffer.dall@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.41 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: , Clearly specify that option 1 is strongly preferred so that developers understand that option 2 or 3 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 --- 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..54188a3 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