From fa71339b6e9a78470de249fe44846655a323d6af Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 27 Feb 2018 09:22:55 -0800 Subject: [PATCH] LU-10731 kernel: kernel update [SLES12 SP3 4.4.114-94.14] 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: Id4be7ff0fb1606283b5e3b4eed7dcf69e6b4f4bf Reviewed-on: https://review.whamcloud.com/31452 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Reviewed-by: John L. Hammond --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config | 2 +- lustre/kernel_patches/targets/4.4-sles12sp3.target.in | 8 ++------ lustre/kernel_patches/which_patch | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index f9e08a5..5acc1a7 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.114-92.64 (SLES12 SP2) - 4.4.114-94.11 (SLES12 SP3) + 4.4.114-94.14 (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.114-92.64 (SLES12 SP2) - 4.4.114-94.11 (SLES12 SP3) + 4.4.114-94.14 (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 0dfc599..61c924f 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 @@ -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="-94.11-default" +CONFIG_LOCALVERSION="-94.14-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 b9cedec..bdb6d57 100644 --- a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in @@ -1,14 +1,10 @@ lnxmaj="4.4" lnxmin=".114" -lnxrel="94.11" +lnxrel="94.14" # 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=".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" +rpmfix=".1" # 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 0bfc3e0..c0cd910 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.114-92.64 (SLES12 SP2) -4.4-sles12sp3.series 4.4.114-94.11 (SLES12 SP3) +4.4-sles12sp3.series 4.4.114-94.14 (SLES12 SP3) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1