From 88a6260068d4fd110c8f56018c2222fb4d245ea0 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Wed, 25 Oct 2017 16:53:52 -0700 Subject: [PATCH] LU-10164 kernel: kernel update [SLES12 SP3 4.4.92-6.18] 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: I4b046f0ac64b75545cd0e2a3a44e9117f4d79ef4 Reviewed-on: https://review.whamcloud.com/29793 Tested-by: Jenkins Reviewed-by: Minh Diep Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config | 4 ++-- lustre/kernel_patches/targets/4.4-sles12sp3.target.in | 4 ++-- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index c788f79..03f2ee1 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.74-92.35 (SLES12 SP2) - 4.4.82-6.9 (SLES12 SP3) + 4.4.92-6.18 (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.74-92.35 (SLES12 SP2) - 4.4.82-6.9 (SLES12 SP3) + 4.4.92-6.18 (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 c946efe..c388fad 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.82 Kernel Configuration +# Linux/x86 4.4.92 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.9-default" +CONFIG_LOCALVERSION="-6.18-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y diff --git a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in index e9b83c9..606dbd7 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=".82" -lnxrel="6.9" +lnxmin=".92" +lnxrel="6.18" # 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 3605e29..5f7cfae 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.74-92.35 (SLES12 SP2) -4.4-sles12sp3.series 4.4.82-6.9 (SLES12 SP3) +4.4-sles12sp3.series 4.4.92-6.18 (SLES12 SP3) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1