From ac24d42d44e651a5e1cea7c9477ace2b1eba198a Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Thu, 4 Jan 2018 07:57:37 -0800 Subject: [PATCH] LU-10455 kernel: kernel update RHEL7.4 [3.10.0-693.11.6.el7] update RHEL 7.4 kernel to 3.10.0-693.11.6.el7 Signed-off-by: Bob Glossman Change-Id: Id3428aa00e4b1501b642587db7911b6adafd51ef Reviewed-on: https://review.whamcloud.com/30734 Reviewed-by: James Nunez Reviewed-by: Minh Diep Reviewed-by: Yang Sheng Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config | 1 + lustre/kernel_patches/targets/3.10-rhel7.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 3a9a84b..1fdd7e1 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -8,7 +8,7 @@ TBD Intel Corporation 2.6.32-573.26.1.el6 (RHEL6.7) 2.6.32-642.15.1.el6 (RHEL6.8) 2.6.32-696.16.1.el6 (RHEL6.9) - 3.10.0-693.11.1.el7 (RHEL7.4) + 3.10.0-693.11.6.el7 (RHEL7.4) 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 @@ TBD Intel Corporation 2.6.32-573.26.1.el6 (RHEL6.7) 2.6.32-642.15.1.el6 (RHEL6.8) 2.6.32-696.16.1.el6 (RHEL6.9) - 3.10.0-693.11.1.el7 (RHEL7.4) + 3.10.0-693.11.6.el7 (RHEL7.4) 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 b52cbbf..6648486 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 @@ -5657,6 +5657,7 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y +CONFIG_KAISER=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 dfb237f..a11b86e 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="693.11.1.el7" +lnxrel="693.11.6.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 13be9f8..b6fcf0b 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.8.series 2.6.32-696.16.1.el6 (RHEL 6.9) -3.10-rhel7.series 3.10.0-693.11.1.el7 (RHEL 7.4) +3.10-rhel7.series 3.10.0-693.11.6.el7 (RHEL 7.4) 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