* [Qemu-devel] [PATCH] docs: add details regarding submitting stable-specific patches
@ 2018-06-12 22:19 Michael Roth
2018-06-13 8:48 ` Cornelia Huck
0 siblings, 1 reply; 2+ messages in thread
From: Michael Roth @ 2018-06-12 22:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Cornelia Huck
Also add a few more details regarding normal master->stable patch
flow.
Cc: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
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 maintainer)
on copy.
+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 stable
+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 tagged
+with a "for-stable" or a "for-<stable-version>" 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
----------------------
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] docs: add details regarding submitting stable-specific patches
2018-06-12 22:19 [Qemu-devel] [PATCH] docs: add details regarding submitting stable-specific patches Michael Roth
@ 2018-06-13 8:48 ` Cornelia Huck
0 siblings, 0 replies; 2+ messages in thread
From: Cornelia Huck @ 2018-06-13 8:48 UTC (permalink / raw)
To: Michael Roth; +Cc: qemu-devel
On Tue, 12 Jun 2018 17:19:23 -0500
Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> Also add a few more details regarding normal master->stable patch
> flow.
>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
> 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 maintainer)
> on copy.
>
> +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 stable
> +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 tagged
> +with a "for-stable" or a "for-<stable-version>" in the subject line to
> +indicate that's it's specifically for a stable branch and not master. For
s/that's/that/
> +instance:
> +
> + [PATCH for-2.11.2] spapr: make pseries-2.11 the default machine type
> +
> +
> Stable release process
> ----------------------
>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-13 8:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-12 22:19 [Qemu-devel] [PATCH] docs: add details regarding submitting stable-specific patches Michael Roth
2018-06-13 8:48 ` Cornelia Huck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.