Branch b1_8

b=19321
i=johann

add the jbd2 fix (wrong jiffie rounding) to the rhel5 series files.

diff --git a/lustre/kernel_patches/series/2.6-rhel5.series b/lustre/kernel_patches/series/2.6-rhel5.series
index 2b00594..41f55fc 100644 (file)
--- a/lustre/kernel_patches/series/2.6-rhel5.series
+++ b/lustre/kernel_patches/series/2.6-rhel5.series
@@ -24,3 +24,4 @@ prune-icache-use-trylock-rhel5.patch
 jbd-slab-race-2.6-rhel5.patch
 mpt-fusion-max-sge.patch
 jbd2-jcberr-2.6-rhel5.patch
+jbd2-commit-timer-no-jiffies-rounding.diff