From 2383a62d61b1bf43eb967c1f1e9babedde68b259 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 30 May 2017 08:28:54 -0700 Subject: [PATCH] LU-9572 kernel: kernel update RHEL6.9 [2.6.32-696.3.1.el6] Update RHEL6.9 kernel to 2.6.32-696.3.1.el6 Test-Parameters: clientdistro=el6.9 mdsdistro=el6.9 \ ossdistro=el6.9 mdtfilesystemtype=ldiskfs \ ostfilesystemtype=ldiskfs testgroup=review-ldiskfs Change-Id: Ie61a7a8c521acd40ebf5106db17dcfb5d25f7a7f Signed-off-by: Bob Glossman Reviewed-on: https://review.whamcloud.com/27358 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-2.6.32-2.6-rhel6.9-x86_64.config | 2 +- lustre/kernel_patches/targets/2.6-rhel6.9.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 673a620..cebbd67 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -7,7 +7,7 @@ TBD Intel Corporation 2.6.32-504.30.3.el6 (RHEL6.6) 2.6.32-573.26.1.el6 (RHEL6.7) 2.6.32-642.15.1.el6 (RHEL6.8) - 2.6.32-696.1.1.el6 (RHEL6.9) + 2.6.32-696.3.1.el6 (RHEL6.9) 3.10.0-514.21.1.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-100 (SLES11 SP4) @@ -19,7 +19,7 @@ TBD Intel Corporation 2.6.32-504.30.3.el6 (RHEL6.6) 2.6.32-573.26.1.el6 (RHEL6.7) 2.6.32-642.15.1.el6 (RHEL6.8) - 2.6.32-696.1.1.el6 (RHEL6.9) + 2.6.32-696.3.1.el6 (RHEL6.9) 3.10.0-514.21.1.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-100 (SLES11 SP4) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.9-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.9-x86_64.config index 046363e..e79574b 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.9-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.9-x86_64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue Mar 7 08:18:23 2017 +# Tue May 30 08:32:41 2017 # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff --git a/lustre/kernel_patches/targets/2.6-rhel6.9.target.in b/lustre/kernel_patches/targets/2.6-rhel6.9.target.in index 35e75d2..eabc80a 100644 --- a/lustre/kernel_patches/targets/2.6-rhel6.9.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel6.9.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.32" -lnxrel="696.1.1.el6" +lnxrel="696.3.1.el6" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel6.8.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 5bdb778..0c4e2db 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -17,7 +17,7 @@ PATCH SERIES FOR SERVER KERNELS: 2.6-rhel6.series 2.6.32-504.30.3.el6 (RHEL 6.6) 2.6-rhel6.series 2.6.32-573.26.1.el6 (RHEL 6.7) 2.6-rhel6.8.series 2.6.32-642.15.1.el6 (RHEL 6.8) -2.6-rhel6.8.series 2.6.32-696.1.1.el6 (RHEL 6.9) +2.6-rhel6.8.series 2.6.32-696.3.1.el6 (RHEL 6.9) 3.10-rhel7.series 3.10.0-514.21.1.el7 (RHEL 7.3) 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) 3.0-sles11sp3.series 3.0.101-100 (SLES11 SP4) -- 1.8.3.1