From: Bob Glossman Date: Fri, 9 Feb 2018 18:26:17 +0000 (-0800) Subject: LU-10653 kernel: kernel update [SLES12 SP2 4.4.114-92.64] X-Git-Tag: 2.10.4-RC1~101 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F31274%2F2;p=fs%2Flustre-release.git LU-10653 kernel: kernel update [SLES12 SP2 4.4.114-92.64] Update target and kernel_config files for new version Test-Parameters: clientdistro=sles12sp2 testgroup=review-ldiskfs \ mdsdistro=sles12sp2 ossdistro=sles12sp2 \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Signed-off-by: Bob Glossman Change-Id: I98f3784eddc05e4faf00091e05b751d78090f66d Reviewed-on: https://review.whamcloud.com/31274 Tested-by: Jenkins Reviewed-by: Minh Diep Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: John L. Hammond --- diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12 index 6a21843..117b6e5 100644 --- a/contrib/lbuild/lbuild-sles12 +++ b/contrib/lbuild/lbuild-sles12 @@ -23,7 +23,13 @@ kernel_srpm_location() { 4.4) kminor=${lnxmin##.} kdir=updates-sles12.2-src - if [ $kminor -eq 103 ] + if [ $kminor -eq 114 ] + then + if [ ${lnxrel%%.*} -gt 92 ] + then + kdir=updates-sles12.3-src + fi + elif [ $kminor -eq 103 ] then if [ ${lnxrel%%.*} -lt 90 ] then @@ -160,7 +166,13 @@ find_linux_rpm-sles12() { 4.4) kminor=${lnxmin##.} kdir=updates-sles12.2-x86_64 - if [ $kminor -eq 103 ] + if [ $kminor -eq 114 ] + then + if [ ${lnxrel%%.*} -gt 92 ] + then + kdir=updates-sles12.3-x86_64 + fi + elif [ $kminor -eq 103 ] then if [ ${lnxrel%%.*} -lt 90 ] then diff --git a/lustre/ChangeLog b/lustre/ChangeLog index ca3b87e..5804569 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -12,7 +12,7 @@ 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.103-92.56 (SLES12 SP2) + 4.4.114-92.64 (SLES12 SP2) 4.4.114-94.11 (SLES12 SP3) vanilla linux 4.6.7 (ZFS only) * Client known to build on unpatched kernels: @@ -25,7 +25,7 @@ 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.103-92.56 (SLES12 SP2) + 4.4.114-92.64 (SLES12 SP2) 4.4.114-94.11 (SLES12 SP3) vanilla linux 4.6.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer diff --git a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config index fa1f288..7c2e6e8 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-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="-92.56-default" +CONFIG_LOCALVERSION="-92.64-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -407,6 +407,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 @@ -1677,6 +1678,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 @@ -6644,7 +6646,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-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in index c6d22eb..2b45da0 100644 --- a/lustre/kernel_patches/targets/4.4-sles12.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12.target.in @@ -1,6 +1,6 @@ lnxmaj="4.4" -lnxmin=".103" -lnxrel="92.56" +lnxmin=".114" +lnxrel="92.64" # 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 04f450f..0bfc3e0 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -22,7 +22,7 @@ PATCH SERIES FOR SERVER KERNELS: 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) -4.4-sles12.series 4.4.103-92.56 (SLES12 SP2) +4.4-sles12.series 4.4.114-92.64 (SLES12 SP2) 4.4-sles12sp3.series 4.4.114-94.11 (SLES12 SP3) See lustre/ChangeLog for supported client kernel versions.