From nobody Wed Apr 24 07:36:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528842053862208.31270339913294; Tue, 12 Jun 2018 15:20:53 -0700 (PDT) Received: from localhost ([::1]:58703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSren-0000dI-6x for importer@patchew.org; Tue, 12 Jun 2018 18:20:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSrdn-000070-KO for qemu-devel@nongnu.org; Tue, 12 Jun 2018 18:19:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSrdk-0007TE-WC for qemu-devel@nongnu.org; Tue, 12 Jun 2018 18:19:51 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44252) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fSrdk-0007R2-N7 for qemu-devel@nongnu.org; Tue, 12 Jun 2018 18:19:48 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w5CMIx6d044322 for ; Tue, 12 Jun 2018 18:19:46 -0400 Received: from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.150]) by mx0a-001b2d01.pphosted.com with ESMTP id 2jjpc5rys3-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 12 Jun 2018 18:19:45 -0400 Received: from localhost by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Jun 2018 16:19:45 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (9.17.130.17) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 12 Jun 2018 16:19:42 -0600 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w5CMJfij21561680 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 12 Jun 2018 15:19:41 -0700 Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A2E3378064; Tue, 12 Jun 2018 16:19:41 -0600 (MDT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 89BE57805F; Tue, 12 Jun 2018 16:19:41 -0600 (MDT) Received: from localhost (unknown [9.53.92.156]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 12 Jun 2018 16:19:41 -0600 (MDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 12 Jun 2018 17:19:23 -0500 X-Mailer: git-send-email 2.11.0 X-TM-AS-GCONF: 00 x-cbid: 18061222-0004-0000-0000-000014515B4C X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009178; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000265; SDB=6.01046071; UDB=6.00535710; IPR=6.00825048; MB=3.00021612; MTD=3.00000008; XFM=3.00000015; UTC=2018-06-12 22:19:43 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18061222-0005-0000-0000-000087B723E0 Message-Id: <20180612221923.24469-1-mdroth@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-06-12_14:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806120247 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH] docs: add details regarding submitting stable-specific patches X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cornelia Huck Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Also add a few more details regarding normal master->stable patch flow. Cc: Cornelia Huck Signed-off-by: Michael Roth Reviewed-by: Cornelia Huck --- docs/devel/stable-process.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/devel/stable-process.rst b/docs/devel/stable-process.rst index 98736a9ea4..008fb4f9b4 100644 --- a/docs/devel/stable-process.rst +++ b/docs/devel/stable-process.rst @@ -56,6 +56,21 @@ There are various ways to get a patch into stable: appropriate other people (like the patch author or the relevant maintain= er) on copy. =20 +Generally patches for a stable release/branch must first be included in the +master QEMU branch, and from there the stable branch's maintainer will +cherry-pick/backport the patch. However, occasionally there is a need to +apply a stable-specific patch, such as a fix from master that isn't easily +cherry-picked and has been reworked/backported specifically for a stable +branch, or a fix that's only necessary in the context of a particular stab= le +release. In such cases, the patch can be submitted to qemu-devel@nongnu.org +using Cc: qemu-stable@nongnu.org just like a normal stable patch, but tagg= ed +with a "for-stable" or a "for-" in the subject line to +indicate that's it's specifically for a stable branch and not master. For +instance: + + [PATCH for-2.11.2] spapr: make pseries-2.11 the default machine type + + Stable release process ---------------------- =20 --=20 2.11.0