Branch HEAD

b=13969
i=scjody
i=johann

Update to RHEL5 kernel 2.6.18-8.1.15.el5.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index ca41040..ff37e1d 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -3,7 +3,7 @@
         2.6.5-7.287.3 (SLES 9),
         2.6.9-55.0.12.EL (RHEL 4),
         2.6.16.53-0.16 (SLES 10),
         2.6.5-7.287.3 (SLES 9),
         2.6.9-55.0.12.EL (RHEL 4),
         2.6.16.53-0.16 (SLES 10),

-        2.6.18-8.1.14.EL5 (RHEL 5).
+        2.6.18-8.1.15.EL5 (RHEL 5).

         2.6.18.8 vanilla (kernel.org)
        * Client support for unpatched kernels:
         (see http://wiki.lustre.org/index.php?title=Patchless_Client)
         2.6.18.8 vanilla (kernel.org)
        * Client support for unpatched kernels:
         (see http://wiki.lustre.org/index.php?title=Patchless_Client)


@@ -13,6 +13,10 @@
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
 
 Severity   : normal
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
 
 Severity   : normal

+Bugzilla   : 13969
+Description: Update to RHEL5 kernel 2.6.18-8.1.15.el5.
+
+Severity   : normal

 Bugzilla   : 13874
 Description: Update to SLES10 SP1 kernel 2.6.16.53-0.16
 
 Bugzilla   : 13874
 Description: Update to SLES10 SP1 kernel 2.6.16.53-0.16
 

diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index eceac15..9142d99 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel5.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.18"
 lnxmaj="2.6.18"

-lnxrel="8.1.14.el5"
+lnxrel="8.1.15.el5"

 
 KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
 SERIES=2.6-rhel5.series
 
 KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
 SERIES=2.6-rhel5.series

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 61299e2..e9db7d7 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -5,7 +5,7 @@ SUPPORTED KERNELS:
 2.6-suse-newer        SLES9: 2.6.5-7.287.3      extra patches for SLES9 after SP1
 2.6-rhel4             RHEL4: 2.6.9-55.0.12.EL
 2.6-sles10            SLES10: 2.6.16.53-0.16
 2.6-suse-newer        SLES9: 2.6.5-7.287.3      extra patches for SLES9 after SP1
 2.6-rhel4             RHEL4: 2.6.9-55.0.12.EL
 2.6-sles10            SLES10: 2.6.16.53-0.16

-2.6-rhel5.series      RHEL5: 2.6.18-8.1.14.el5
+2.6-rhel5.series      RHEL5: 2.6.18-8.1.15.el5

 2.6.18-vanilla.series kernel.org: 2.6.18.8
 
 CLIENT SUPPORT FOR UNPATCHED KERNELS:
 2.6.18-vanilla.series kernel.org: 2.6.18.8
 
 CLIENT SUPPORT FOR UNPATCHED KERNELS: