From b32666d9c34c654a189786f8955afb4f691cbcd4 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Mon, 3 Apr 2017 16:03:36 -0700 Subject: [PATCH] LU-9287 kernel: kernel update [SLES11 SP4 3.0.101-97] Update SLES11 SP4 kernel to 3.0.101-97 Test-Parameters: mdsdistro=sles11sp4 ossdistro=sles11sp4 \ clientdistro=sles11sp4 mdtfilesystemtype=ldiskfs \ ostfilesystemtype=ldiskfs testgroup=review-ldiskfs Signed-off-by: Bob Glossman Change-Id: I5214114b5c0bb0bfe5a68dbe8cf2a1f26705d352 Reviewed-on: https://review.whamcloud.com/26336 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-3.0-3.0-sles11sp4-x86_64.config | 2 +- lustre/kernel_patches/targets/3.0-sles11sp4.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 fa6db3f..dde6b96 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -10,7 +10,7 @@ TBD Intel Corporation 2.6.32-696.el6 (RHEL6.9) 3.10.0-514.10.2.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) - 3.0.101-94 (SLES11 SP4) + 3.0.101-97 (SLES11 SP4) 3.12.69-60.64.32 (SLES12 SP1) 4.4.49-92.14 (SLES12 SP2) vanilla linux 4.6.7 (ZFS only) @@ -22,7 +22,7 @@ TBD Intel Corporation 2.6.32-696.el6 (RHEL6.9) 3.10.0-514.10.2.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) - 3.0.101-94 (SLES11 SP4) + 3.0.101-97 (SLES11 SP4) 3.12.69-60.64.32 (SLES12 SP1) 4.4.49-92.14 (SLES12 SP2) vanilla linux 4.6.7 diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp4-x86_64.config index 473637a..337876e 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp4-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp4-x86_64.config @@ -66,7 +66,7 @@ CONFIG_IRQ_WORK=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="-94-default" +CONFIG_LOCALVERSION="-97-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y diff --git a/lustre/kernel_patches/targets/3.0-sles11sp4.target.in b/lustre/kernel_patches/targets/3.0-sles11sp4.target.in index 8a74b596..653bd14 100644 --- a/lustre/kernel_patches/targets/3.0-sles11sp4.target.in +++ b/lustre/kernel_patches/targets/3.0-sles11sp4.target.in @@ -1,6 +1,6 @@ lnxmaj="3.0" lnxmin=".101" -lnxrel="94" +lnxrel="97" # 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 3a3a601..4af2295 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -20,7 +20,7 @@ PATCH SERIES FOR SERVER KERNELS: 2.6-rhel6.8.series 2.6.32-696.el6 (RHEL 6.9) 3.10-rhel7.series 3.10.0-514.10.2.el7 (RHEL 7.3) 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) -3.0-sles11sp3.series 3.0.101-94 (SLES11 SP4) +3.0-sles11sp3.series 3.0.101-97 (SLES11 SP4) 3.12-sles12.series 3.12.69-60.64.32 (SLES12 SP1) 4.4-sles12.series 4.4.49-92.14 (SLES12 SP2) -- 1.8.3.1