From a816b62dfda16e4b899b2eba564ff3f0bc0e735b Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Mon, 18 Sep 2017 08:39:58 -0700 Subject: [PATCH] LU-10000 kernel: kernel update [SLES12 SP2 4.4.74-92.38] 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: I825369d9cafd4f75dc193f614d5adfe87769fcd1 Reviewed-on: https://review.whamcloud.com/29069 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: John L. Hammond --- lustre/ChangeLog | 4 ++-- .../kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config | 2 +- lustre/kernel_patches/targets/4.4-sles12.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index f25759a..de5048d 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.74-92.35 (SLES12 SP2) + 4.4.74-92.38 (SLES12 SP2) vanilla linux 4.6.7 (ZFS only) * Client known to build on unpatched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) @@ -24,7 +24,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.74-92.35 (SLES12 SP2) + 4.4.74-92.38 (SLES12 SP2) vanilla linux 4.6.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer * Recommended ZFS / SPL version: 0.6.5.9 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 fe185c1..357d941 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 @@ -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.35-default" +CONFIG_LOCALVERSION="-92.38-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-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in index 37f30cb..4535370 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=".74" -lnxrel="92.35" +lnxrel="92.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 a71d5b4..f0b1459 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -22,6 +22,6 @@ 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.74-92.35 (SLES12 SP2) +4.4-sles12.series 4.4.74-92.38 (SLES12 SP2) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1