From: Bob Glossman Date: Mon, 28 Nov 2016 20:50:04 +0000 (-0800) Subject: LU-8954 kernel: kernel update [SLES12 SP1 3.12.67-60.64.24] X-Git-Tag: 2.9.53~30 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=0a9f9ab41b4fd2a697439a195aa3ee7cf0705e64;hp=1125aff15ba2ae0dd8be179c642d3215d934b7fd LU-8954 kernel: kernel update [SLES12 SP1 3.12.67-60.64.24] 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: I6c474a939e3d6e8853388d645d82dbfe3038edee Reviewed-on: https://review.whamcloud.com/24427 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series b/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series index 9ba99ec..65244d0 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series @@ -15,7 +15,7 @@ rhel7/ext4-nocmtime.patch rhel7/ext4-large-dir.patch sles12/ext4-pdirop.patch rhel7/ext4-max-dir-size.patch -sles12/ext4-remove-truncate-warning.patch +rhel7/ext4-remove-truncate-warning.patch sles12/ext4-corrupted-inode-block-bitmaps-handling-patches.patch rhel7/ext4-give-warning-with-dir-htree-growing.patch rhel7/ext4-mmp-brelse.patch diff --git a/lustre/ChangeLog b/lustre/ChangeLog index cc0cbd8..f806443 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -10,6 +10,7 @@ TBD Intel Corporation 3.10.0-514.2.2.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-91 (SLES11 SP4) + 3.12.67-60.64.24 (SLES12 SP1) 4.4.21-84 (SLES12 SP2) vanilla linux 4.5.7 (ZFS only) * Client known to build on unpatched kernels: @@ -20,6 +21,7 @@ TBD Intel Corporation 3.10.0-514.2.2.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-91 (SLES11 SP4) + 3.12.67-60.64.24 (SLES12 SP1) 4.4.21-84 (SLES12 SP2) vanilla linux 4.5.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer 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 e47a4dd..60c7dee 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.62 Kernel Configuration +# Linux/x86 3.12.67 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.64.8-default" +CONFIG_LOCALVERSION="-60.64.24-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -521,8 +521,7 @@ CONFIG_HZ=250 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y -CONFIG_KEXEC_VERIFY_SIG=y -CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y +# CONFIG_KEXEC_VERIFY_SIG is not set CONFIG_CRASH_DUMP=y # CONFIG_KEXEC_JUMP is not set CONFIG_PHYSICAL_START=0x200000 diff --git a/lustre/kernel_patches/targets/3.12-sles12.target.in b/lustre/kernel_patches/targets/3.12-sles12.target.in index 3453ae8..ec92ecf 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=".62" -lnxrel="60.64.8" +lnxmin=".67" +lnxrel="60.64.24" # 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" +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 cd8d882..60ca8d8 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -20,6 +20,7 @@ PATCH SERIES FOR SERVER KERNELS: 3.10-rhel7.series 3.10.0-514.2.2.el7 (RHEL 7.3) 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) 3.0-sles11sp3.series 3.0.101-91 (SLES11 SP4) -3.12-sles12.series 4.4.21-84 (SLES12 SP2) +3.12-sles12.series 3.12.67-60.64.24 (SLES12 SP1) +4.4-sles12.series 4.4.21-84 (SLES12 SP2) See lustre/ChangeLog for supported client kernel versions.