From: Bob Glossman Date: Thu, 21 Dec 2017 18:13:08 +0000 (-0800) Subject: LU-10425 kernel: kernel update [SLES12 SP3 4.4.103-6.33] X-Git-Tag: 2.10.3-RC1~10 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6ae928b87fb85125293760d40d586893b3ea3feb LU-10425 kernel: kernel update [SLES12 SP3 4.4.103-6.33] 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: Ibdaf6edeb34388d3d9bf39dc7f84639d5fb9992f Reviewed-on: https://review.whamcloud.com/30648 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Cliff White Reviewed-by: John L. Hammond --- diff --git a/lustre/ChangeLog b/lustre/ChangeLog index fb965ac..988deae 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.90-92.45 (SLES12 SP2) - 4.4.92-6.18 (SLES12 SP3) + 4.4.103-6.33 (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.90-92.45 (SLES12 SP2) - 4.4.92-6.18 (SLES12 SP3) + 4.4.103-6.33 (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 c388fad..8d67988 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.92 Kernel Configuration +# Linux/x86 4.4.103 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.18-default" +CONFIG_LOCALVERSION="-6.33-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -834,7 +834,6 @@ CONFIG_IA32_AOUT=m CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y CONFIG_PMC_ATOM=y CONFIG_VMD=y @@ -6500,6 +6499,7 @@ CONFIG_HAVE_ARCH_KASAN=y # CONFIG_LOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set @@ -6636,10 +6636,11 @@ CONFIG_LKDTM=m CONFIG_PROVIDE_OHCI1394_DMA_INIT=y # CONFIG_BUILD_DOCSRC is not set # CONFIG_DMA_API_DEBUG is not set -# CONFIG_TEST_LKM is not set +CONFIG_TEST_LKM=m # CONFIG_TEST_USER_COPY is not set # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set +CONFIG_TEST_SYSCTL=m # CONFIG_TEST_UDELAY is not set CONFIG_MEMTEST=y # CONFIG_TEST_STATIC_KEYS is not set @@ -6694,6 +6695,7 @@ CONFIG_OPTIMIZE_INLINING=y # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y # CONFIG_BIG_KEYS is not set CONFIG_TRUSTED_KEYS=y diff --git a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in index 606dbd7..15d97c0 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=".92" -lnxrel="6.18" +lnxmin=".103" +lnxrel="6.33" # 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 8ec7246..13be9f8 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.92-6.18 (SLES12 SP3) +4.4-sles12sp3.series 4.4.103-6.33 (SLES12 SP3) See lustre/ChangeLog for supported client kernel versions.