- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)

[fs/lustre-release.git] / lustre / kernel_patches / README

diff --git a/lustre/kernel_patches/README b/lustre/kernel_patches/README
index 7d4c4b6..1860f13 100644 (file)
--- a/lustre/kernel_patches/README
+++ b/lustre/kernel_patches/README
@@ -57,7 +57,7 @@ within the root of that tree.  The scripts manage a "stack" of patches.
 Each patch is a changeset against the base tree plus the preceding patches.
 
 All patches are listed, in order, in the file ./series.  You manage the
-series file.
+series file.  Lines in the series file which start with `#' are ignored.
 
 Any currently-applied patches are described in the file
 ./applied-patches.  The patch scripts manage this file.
@@ -351,6 +351,15 @@ inpatch
 
        cat pc/$(toppatch).pc
 
+join-patch patchname
+
+  "joins" the named patch to the current topmost patch.
+
+  Use this when you want to merge two patches into one.  All the
+  files which `patchname' affects are added to pc/$(toppatch).pc (if
+  they are not already there) and patch `patchname' is applied.  The
+  top patch remains unchanged.  You'll need to run refpatch afterwards.
+
 mpatch
 
   A low-level thing to generate patches