From 3c56806aec5b8d0089cea5e0862219cce8abfa30 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 9 Jan 2018 07:45:42 -0800 Subject: [PATCH] LU-10458 kernel: kernel update [SLES12 SP3 4.4.103-6.38] Update target and kernel_config files for new version Test-Parameters: clientdistro=sles12sp3 testgroup=review-ldiskfs \ mdsdistro=sles12sp3 ossdistro=sles12sp3 \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Signed-off-by: Bob Glossman Change-Id: Ib7a308dbce58d94c5f5775cd54f33563cf067e7 Reviewed-on: https://review.whamcloud.com/30738 Reviewed-by: James Nunez Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config | 3 ++- lustre/kernel_patches/targets/4.4-sles12sp3.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 1fdd7e1..0fd2300 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -13,7 +13,7 @@ TBD Intel Corporation 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) 4.4.90-92.45 (SLES12 SP2) - 4.4.103-6.33 (SLES12 SP3) + 4.4.103-6.38 (SLES12 SP3) vanilla linux 4.6.7 (ZFS only) * Client known to build on unpatched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) @@ -26,7 +26,7 @@ TBD Intel Corporation 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) 4.4.90-92.45 (SLES12 SP2) - 4.4.103-6.33 (SLES12 SP3) + 4.4.103-6.38 (SLES12 SP3) vanilla linux 4.6.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer * Recommended ZFS / SPL version: 0.7.3 diff --git a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config index 8d67988..c083bcf 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config @@ -54,7 +54,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-6.33-default" +CONFIG_LOCALVERSION="-6.38-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -6702,6 +6702,7 @@ CONFIG_TRUSTED_KEYS=y CONFIG_ENCRYPTED_KEYS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y +CONFIG_KAISER=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y diff --git a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in index 15d97c0..748f779 100644 --- a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in @@ -1,6 +1,6 @@ lnxmaj="4.4" lnxmin=".103" -lnxrel="6.33" +lnxrel="6.38" # use this when there is an "RPM fix" which means that the name of the # (source) RPM has been updated but the version of the kernel inside the # RPM is not also updated diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index b6fcf0b..df5ad57 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -23,6 +23,6 @@ PATCH SERIES FOR SERVER KERNELS: 3.0-sles11sp3.series 3.0.101-107 (SLES11 SP4) 3.12-sles12.series 3.12.74-60.64.40 (SLES12 SP1) 4.4-sles12.series 4.4.90-92.45 (SLES12 SP2) -4.4-sles12sp3.series 4.4.103-6.33 (SLES12 SP3) +4.4-sles12sp3.series 4.4.103-6.38 (SLES12 SP3) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1