To better identify the base of quilt trees (and the patches inside to use) via the series file the following comments have been agreed on:
# BASE <SHA1 or ref>- comment at the top of the series file to reference base in linus tree
# NEXT_BASE <TREENAME>- names another git or quilt tree (out of
Next/Trees) that is also imported ahead and so gives a loose ordering how the trees apply correctly while a missing/empty <TREENAME> will fall back to BASE (mark is optional)
- but this point is still under discussion
- Greg KH <greg@kroah.com> proposed maintainers should be able to name their trees according to their needs
- Stephen replied
- every maintainer can/should suggest a name for it inside linux-next (best before/on inclusion request), but Stephen can of course veto to avoid meta-conflicts
# NEXT_PATCHES_START- marks the beginning of a subset of patches to be actually used for the import (mark is optional)
# NEXT_PATCHES_END- marks the end of the subset (mark is optional)
So, a example could e.g. look like this:
# BASE 2.6.25-rc2-git1
# NEXT_BASE driver-core
# NEXT_PATCHES_START
docbook-audit-prms.patch
docbook-blk-prms.patch
docbook-drv-base.patch
docbook-skbuffh-prm.patch
# NEXT_PATCHES_END
kerndoc-usb-hdr.patch