From 44d48f9b5e7aa949dd961da8022985a958469dc1 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Thu, 30 Mar 2017 08:56:29 -0700 Subject: [PATCH] LU-9275 kernel: kernel update [SLES12 SP2 4.4.49-92.14] 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: I1d9c109904a61989b8eeb82c21ab99154db464cf Reviewed-on: https://review.whamcloud.com/26263 Tested-by: Jenkins Reviewed-by: James Nunez Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- 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 7c9df65..fa6db3f 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -12,7 +12,7 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-94 (SLES11 SP4) 3.12.69-60.64.32 (SLES12 SP1) - 4.4.49-92.11 (SLES12 SP2) + 4.4.49-92.14 (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 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-94 (SLES11 SP4) 3.12.69-60.64.32 (SLES12 SP1) - 4.4.49-92.11 (SLES12 SP2) + 4.4.49-92.14 (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 92c9baa..b40259a 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.11-default" +CONFIG_LOCALVERSION="-92.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-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in index aaad081..24334a1 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=".49" -lnxrel="92.11" +lnxrel="92.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 diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 1dee62a..3a3a601 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-94 (SLES11 SP4) 3.12-sles12.series 3.12.69-60.64.32 (SLES12 SP1) -4.4-sles12.series 4.4.49-92.11 (SLES12 SP2) +4.4-sles12.series 4.4.49-92.14 (SLES12 SP2) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1