From f5ff6bccb3ee98ad7e5ef9909984dd0b170da26a Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Wed, 7 Feb 2018 15:04:40 -0800 Subject: [PATCH] LU-10634 kernel: kernel update [SLES12 SP3 4.4.114-94.11] 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: I3ffcd4c368b2976cffa6a517f9fabcf674781ac9 Reviewed-on: https://review.whamcloud.com/31225 Tested-by: Jenkins Reviewed-by: Yang Sheng Tested-by: Maloo Reviewed-by: John L. Hammond --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config | 8 +++++--- lustre/kernel_patches/targets/4.4-sles12sp3.target.in | 10 +++++++--- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 7c77f58..ca3b87e 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -13,7 +13,7 @@ 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) 4.4.103-92.56 (SLES12 SP2) - 4.4.103-6.38 (SLES12 SP3) + 4.4.114-94.11 (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 @@ 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) 4.4.103-92.56 (SLES12 SP2) - 4.4.103-6.38 (SLES12 SP3) + 4.4.114-94.11 (SLES12 SP3) vanilla linux 4.6.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer * Recommended ZFS / SPL version: 0.7.5 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 c083bcf..0dfc599 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 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.103 Kernel Configuration +# Linux/x86 4.4.114 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -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.38-default" +CONFIG_LOCALVERSION="-94.11-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -414,6 +414,7 @@ CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y +CONFIG_RETPOLINE=y CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_NUMACHIP is not set # CONFIG_X86_VSMP is not set @@ -1693,6 +1694,7 @@ CONFIG_DEV_COREDUMP=y CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_MMIO=m @@ -6702,7 +6704,7 @@ CONFIG_TRUSTED_KEYS=y CONFIG_ENCRYPTED_KEYS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y -CONFIG_KAISER=y +CONFIG_PAGE_TABLE_ISOLATION=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 748f779..b9cedec 100644 --- a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in @@ -1,10 +1,14 @@ lnxmaj="4.4" -lnxmin=".103" -lnxrel="6.38" +lnxmin=".114" +lnxrel="94.11" # 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 -rpmfix=".1" +rpmfix=".2" +# for some odd reasons (bug??) -devel and source have different fix +# so we'll add another one to detect this, make it the same or remove +# this change they fix the bug +rpmfix_diff=".3" # this is the delimeter that goes before the "smp" at the end of the version # defaults to empty diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 9f4b61e..04f450f 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.103-92.56 (SLES12 SP2) -4.4-sles12sp3.series 4.4.103-6.38 (SLES12 SP3) +4.4-sles12sp3.series 4.4.114-94.11 (SLES12 SP3) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1