From 29f97616819084ed6861a333a2615981c61da9e1 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 28 Jun 2016 07:48:37 -0700 Subject: [PATCH] LU-8337 kernel: kernel update [SLES12 SP1 3.12.59-60.41] Update target and kernel_config files for new version Test-Parameters: clientdistro=sles12 testgroup=review-ldiskfs \ mdsdistro=sles12 ossdistro=sles12 mdsfilesystemtype=ldiskfs \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Signed-off-by: Bob Glossman Change-Id: I35038f0715abaa7ae69011e102c19d43b5e416bc Reviewed-on: http://review.whamcloud.com/21051 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 5 ++--- .../kernel_configs/kernel-3.12-3.12-sles12-x86_64.config | 8 +++++--- lustre/kernel_patches/targets/3.12-sles12.target.in | 6 +++--- lustre/kernel_patches/which_patch | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index b03ae58..12d2efe 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -10,7 +10,7 @@ TBD Intel Corporation 3.10.0-327.22.2.el7 (RHEL7.2) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-77 (SLES11 SP4) - 3.12.57-60.35 (SLES12 SP1) + 3.12.59-60.41 (SLES12 SP1) vanilla linux 4.2.1 (ZFS only) * Client known to build on unpatched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) @@ -19,9 +19,8 @@ TBD Intel Corporation 2.6.32-642.1.1.el6 (RHEL6.8) 3.10.0-327.22.2.el7 (RHEL7.2) 3.0.101-0.47.71 (SLES11 SP3) - 3.0.101-68 (SLES11 SP4) 3.0.101-77 (SLES11 SP4) - 3.12.57-60.35 (SLES12 SP1) + 3.12.59-60.41 (SLES12 SP1) vanilla linux 4.4.6 * Recommended e2fsprogs version: 1.42.13.wc4 or newer * Recommended ZFS / SPL version: 0.6.5.7 diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config index f044fec..ab47f0a 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.12.57 Kernel Configuration +# Linux/x86 3.12.59 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="-60.35-default" +CONFIG_LOCALVERSION="-60.41-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -5367,7 +5367,9 @@ CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m CONFIG_SUNRPC_DEBUG=y -# CONFIG_CEPH_FS is not set +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y diff --git a/lustre/kernel_patches/targets/3.12-sles12.target.in b/lustre/kernel_patches/targets/3.12-sles12.target.in index ab8d6b7..08c5413 100644 --- a/lustre/kernel_patches/targets/3.12-sles12.target.in +++ b/lustre/kernel_patches/targets/3.12-sles12.target.in @@ -1,10 +1,10 @@ lnxmaj="3.12" -lnxmin=".57" -lnxrel="60.35" +lnxmin=".59" +lnxrel="60.41" # 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=".1" +rpmfix=".2" # 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 3883892..9e4cc44 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -19,7 +19,7 @@ PATCH SERIES FOR SERVER KERNELS: 2.6-rhel6.8.series 2.6.32-642.1.1.el6 (RHEL 6.8) 3.10-rhel7.series 3.10.0-327.22.2.el7 (RHEL 7.2) 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) -3.0-sles11sp3.series 3.0.1010-77 (SLES11 SP4) -3.12-sles12.series 3.12.57-60.35 (SLES12 SP1) +3.0-sles11sp3.series 3.0.101-77 (SLES11 SP4) +3.12-sles12.series 3.12.59-60.41 (SLES12 SP1) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1