From 473bc6473eb8d6d78069a561dbe035e795d8b7e2 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 9 Jun 2015 08:26:23 -0700 Subject: [PATCH] LU-6698 kernel: kernel update RHEL 6.6 [2.6.32-504.23.4.el6] Update RHEL6.6 kernel to 2.6.32-504.23.4.el6 Signed-off-by: Bob Glossman Change-Id: Iaedc1b81b74cee213650940a3e1791eb73ef40e3 Reviewed-on: http://review.whamcloud.com/15198 Tested-by: Jenkins Reviewed-by: Yang Sheng Reviewed-by: Dmitry Eremin Tested-by: Dmitry Eremin Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-2.6.32-2.6-rhel6.6-i686.config | 4 +++- .../kernel_configs/kernel-2.6.32-2.6-rhel6.6-x86_64.config | 4 +++- lustre/kernel_patches/targets/2.6-rhel6.6.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 3d05639..a8e3505 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -4,12 +4,12 @@ TBD Intel Corporation for currently supported client and server kernel versions. * Server known to build on patched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) - 2.6.32-504.16.2.el6 (RHEL6.6) + 2.6.32-504.23.4.el6 (RHEL6.6) 3.10.0-229.4.2.el7 (RHEL7.1) 3.0.101-0.47.52 (SLES11 SP3) * Client known to build on unpatched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) - 2.6.32-504.16.2.el6 (RHEL6.6) + 2.6.32-504.23.4.el6 (RHEL6.6) 3.10.0-229.4.2.el7 (RHEL7.1) 3.0.101-0.47.52 (SLES11 SP3) 3.12.39-47 (SLES12) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-i686.config index 3ad7b9b..360b903 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue Dec 16 12:04:28 2014 +# Tue Jun 9 08:17:50 2015 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4704,6 +4704,8 @@ CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-x86_64.config index 51184df..4d3521a 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-x86_64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue Dec 16 12:04:28 2014 +# Tue Jun 9 08:17:50 2015 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4539,6 +4539,8 @@ CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m diff --git a/lustre/kernel_patches/targets/2.6-rhel6.6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.6.target.in index f390430..977f164 100644 --- a/lustre/kernel_patches/targets/2.6-rhel6.6.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel6.6.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.32" -lnxrel="504.16.2.el6" +lnxrel="504.23.4.el6" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel6.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 7fd45cb..9b9ddb6 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -14,7 +14,7 @@ Clients since 2.6.18 DO NOT need any patches. PATCH SERIES FOR SERVER KERNELS: 2.6-rhel6.series 2.6.32-431.29.2.el6 (RHEL 6.5) -2.6-rhel6.series 2.6.32-504.16.2.el6 (RHEL 6.6) +2.6-rhel6.series 2.6.32-504.23.4.el6 (RHEL 6.6) 3.10-rhel7.series 3.10.0-229.4.2.el7 (RHEL 7.1) 3.0-sles11sp3.series 3.0.101-0.47.52 (SLES11 SP3) -- 1.8.3.1