From 7b6fb2b06ab7b3c4b94b71ab161f1378166bd47e Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 12 May 2015 16:11:56 -0700 Subject: [PATCH] LU-6593 kernel: kernel update [RHEL7.1 3.10.0-229.4.2.el7] kernel update [RHEL7.1 3.10.0-229.4.2.el7] Test-Parameters: clientdistro=el7 testgroup=review-ldiskfs \ mdtfilesystemtype=ldiskfs mdsfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Signed-off-by: Bob Glossman Change-Id: Id2e221c70d591f6ca852f87a9bdb317c7bd6a2c8 Reviewed-on: http://review.whamcloud.com/14804 Tested-by: Jenkins Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config | 2 ++ lustre/kernel_patches/targets/3.10-rhel7.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 739611b..4d2b125 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -5,12 +5,12 @@ TBD Intel Corporation * 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) - 3.10.0-229.1.2.el7 (RHEL7.1) + 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) - 3.10.0-229.1.2.el7 (RHEL7.1) + 3.10.0-229.4.2.el7 (RHEL7.1) 3.0.101-0.47.52 (SLES11 SP3) * Recommended e2fsprogs version: 1.42.9.wc1 or newer * NFS export disabled when stack size < 8192 (32-bit Lustre clients), diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config index 66dbc1c..9f6e7fd 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config @@ -5088,6 +5088,7 @@ CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_MCRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_ABLK_HELPER_X86=m @@ -5140,6 +5141,7 @@ CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m CONFIG_CRYPTO_SHA512_SSSE3=m +CONFIG_CRYPTO_SHA1_MB=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m diff --git a/lustre/kernel_patches/targets/3.10-rhel7.target.in b/lustre/kernel_patches/targets/3.10-rhel7.target.in index 67d80dd..80483b3 100644 --- a/lustre/kernel_patches/targets/3.10-rhel7.target.in +++ b/lustre/kernel_patches/targets/3.10-rhel7.target.in @@ -1,5 +1,5 @@ lnxmaj="3.10.0" -lnxrel="229.1.2.el7" +lnxrel="229.4.2.el7" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=3.10-rhel7.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index ad8eb55..7fd45cb 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -15,7 +15,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) -3.10-rhel7.series 3.10.0-229.1.2.el7 (RHEL 7.1) +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) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1