process docs: Add some detail about changes during branching

Split out the required work for the new and old branches and be more
specific about what is to be done.  In the RT checklist, reformat and
expand the "turn off debug" instructions.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt
index f91aa0f1ab2bf581fe15d2bd56c165ba96ebf383..caf18d9827fb88de79ebb053891145c947986359 100644 (file)
--- a/docs/process/branching-checklist.txt
+++ b/docs/process/branching-checklist.txt
@@ -80,9 +80,14 @@ Check this with
         grep unstable Config.mk 
 which should produce no output.  Replace as necessary.
 
-Update both new branches according to release-checklist.txt section re
-README etc.
-
-Update new stable tree's MAINTAINERS to contain correct info for this stable branch
+Update newly diverging staging (unstable) according to
+release-technician-checklist.txt section re README etc.
 
+Update newly diverging staging-$v according to
+release-technician-checklist.txt section re README etc.,
+including turning off debug.
 
+Update new stable tree's MAINTAINERS to contain correct info for this
+stable branch: usually, copy text from previous
+staging-$ov:MAINTAINERS section "Stable Release Maintenance"
+into new staging-$v, deleting what's there.

diff --git a/docs/process/release-technician-checklist.txt b/docs/process/release-technician-checklist.txt
index c228e1088ac73b8adfb50958574ebe9ba9fa793d..99746624cf312ebe6afedd6820d7ac801451028c 100644 (file)
--- a/docs/process/release-technician-checklist.txt
+++ b/docs/process/release-technician-checklist.txt
@@ -56,9 +56,14 @@ t=RELEASE-$r
 # if main version number has changed (eg 4.7 -> 4.8) rerun ./autogen.sh
 * rerun ./autogen.sh to update version number in configure
 #    - XEN_EXTRAVERSION should be `.0-rc$(XEN_VENDORVERSION)'
-#    - turn off debug on stable branches
-#           - tools/Rules.mk debug ?= n
-#           - Kconfig.debug default n
+#
+#    - turn off debug on stable branches, if not already done
+#           - tools/Rules.mk
+#                 debug ?= n
+#           - xen/Kconfig.debug
+#                 config DEBUG
+#                     default n
+
 * tag xen-unstable
 
 # In xen.git