From 4e814416526e72d956955d67b3e896b9934860ad Mon Sep 17 00:00:00 2001 From: Yang Sheng Date: Mon, 9 Jul 2018 00:34:20 +0800 Subject: [PATCH] LU-11129 kernel: kernel update RHEL7.5 [3.10.0-862.6.3.el7] Update RHEL7.5 kernel to 3.10.0-862.6.3.el7 Test-Parameters: clientdistro=el7.5 mdsdistro=el7.5 ossdistro=el7.5 mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Signed-off-by: Yang Sheng Change-Id: I59b362135b5c235ac76848afb2d48014b7a4e928 Reviewed-on: https://review.whamcloud.com/32795 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: John L. Hammond --- 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, 5 insertions(+), 5 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 356c68a..16e26f6 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -8,7 +8,7 @@ 2.6.32-573.26.1.el6 (RHEL6.7) 2.6.32-642.15.1.el6 (RHEL6.8) 2.6.32-696.30.1.el6 (RHEL6.9) - 3.10.0-862.3.2.el7 (RHEL7.5) + 3.10.0-862.6.3.el7 (RHEL7.5) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) @@ -21,7 +21,7 @@ 2.6.32-573.26.1.el6 (RHEL6.7) 2.6.32-642.15.1.el6 (RHEL6.8) 2.6.32-696.30.1.el6 (RHEL6.9) - 3.10.0-862.3.2.el7 (RHEL7.5) + 3.10.0-862.6.3.el7 (RHEL7.5) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) 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 c116832..50118c9 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 @@ -5978,7 +5978,7 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_INFINIBAND=y -CONFIG_KAISER=y +CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y CONFIG_SECURITY_SECURELEVEL=y diff --git a/lustre/kernel_patches/targets/3.10-rhel7.target.in b/lustre/kernel_patches/targets/3.10-rhel7.target.in index 835359c..8a2af15 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="862.3.2.el7" +lnxrel="862.6.3.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 dd067e6..ac17d66 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -18,7 +18,7 @@ PATCH SERIES FOR SERVER KERNELS: 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.9.series 2.6.32-696.30.1.el6 (RHEL 6.9) -3.10-rhel7.series 3.10.0-862.3.2.el7 (RHEL 7.5) +3.10-rhel7.series 3.10.0-862.6.3.el7 (RHEL 7.5) 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) 3.0-sles11sp3.series 3.0.101-107 (SLES11 SP4) 3.12-sles12.series 3.12.74-60.64.40 (SLES12 SP1) -- 1.8.3.1