Branch b1_4

Rename the 2.6-suse-lnxi.series file to 2.6-suse-newer.series to make it
more clear that this series is applicable to all SuSE kernels and not
just LNXI kernels.
b=5985

diff --git a/lustre/kernel_patches/series/2.6-suse-newer.series b/lustre/kernel_patches/series/2.6-suse-newer.series
new file mode 100644 (file)
index 0000000..86a2b59
--- /dev/null
+++ b/lustre/kernel_patches/series/2.6-suse-newer.series
@@ -0,0 +1,14 @@
+dev_read_only-2.6-lnxi.patch
+sd_iostats-2.6-suse.patch
+blkdev_tunables-2.6-suse.patch
+bluesmoke-2.6-suse-lnxi.patch 
+mtd-2.6-suse-lnxi.patch 
+perfctr-2.6-suse-lnxi.patch 
+kexec-2.6-suse-lnxi.patch
+export-filemap_populate.patch
+grab_cache_page_nowait_gfp-2.6-suse.patch 
+remove-suid-2.6-suse.patch
+link_notlast-susefix.patch
+uml-exprt-clearuser.patch
+qsnet-suse-2.6.patch 
+fsprivate-2.6.patch

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 4d8423e..7ee0629 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -3,7 +3,13 @@ SERIES             MNEMONIC                 COMMENT                     ARCH
 SUPPORTED KERNELS:
 rhel-2.4.21        linux-2.4.21-20.3EL      RHEL3 2.4.21                all
 2.6-suse           linux-2.6-suse           SLES9 SP1 kernel            all
-2.6-rhel4          linux-2.6-rhel4          RHEL4 2.6.9 kernel       i386,x86_64
+2.6-suse-newer     linux-2.6-suse           SLES9 SP1 kernel add-ons    all
+2.6-rhel4          linux-2.6-rhel4          RHEL4 2.6.9 kernel          all
+
+NB - The patches in the 2.6-suse series should already be in the SLES9 SP1
+     kernel.  The patches in the 2.6-suse-newer series are patches that
+     have been created since the SP1 kernel was released and should be
+     applied to the already-patched SP1 kernel.
 
 UNSUPPORTED KERNELS; BEING PHASED OUT; MAY BE MISSING CRITICAL BUG FIXES:
 hp-pnnl-2.4.20     linux-2.4.20-hp4_pnnl1   same as vanilla but no uml  ia64