From e5cbb5d919601bc9911e74385998b11624ac76b1 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Thu, 7 May 2020 10:30:37 -0700 Subject: [PATCH] LU-13369 kernel: kernel update RHEL7.7 [3.10.0-1062.18.1.el7] Update RHEL7.7 kernel to 3.10.0-1062.18.1.el7. Test-Parameters: trivial clientdistro=el7.7 serverdistro=el7.7 Change-Id: Ifc00fca35a0ad28ba8326e56e693ea39360a8114 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/38240 Reviewed-by: Yang Sheng Tested-by: jenkins Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 50 +++++++++++----------- lustre/kernel_patches/series/3.10-rhel7.7.series | 1 - .../kernel_patches/targets/3.10-rhel7.7.target.in | 2 +- lustre/kernel_patches/which_patch | 26 +++++------ 4 files changed, 39 insertions(+), 40 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 8b344b9..d07e879 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -3,35 +3,35 @@ TBD Whamcloud * See https://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix for currently supported client and server kernel versions. * Server primary kernels built and tested during release cycle: - 3.10.0-1062.9.1.el7 (RHEL7.7) - 3.10.0-1127.el7 (RHEL7.8) + 3.10.0-1062.18.1.el7 (RHEL7.7) + 3.10.0-1127.el7 (RHEL7.8) * Other server kernels known to build and work at some point (others may also work): - 3.10.0-862.14.4.el7 (RHEL7.5) - 3.10.0-957.27.2.el7 (RHEL7.6) - 4.18.0-80.11.2.el8 (RHEL8.0) - 4.18.0-147.8.1.el8 (RHEL8.1) - 4.4.120-92.70 (SLES12 SP2) - 4.4.180-94.100 (SLES12 SP3) - 4.4.0-131 (Ubuntu 16.04) - 4.15.0-32 (Ubuntu 18.04) - vanilla linux 4.6.7 (ZFS only) + 3.10.0-862.14.4.el7 (RHEL7.5) + 3.10.0-957.27.2.el7 (RHEL7.6) + 4.18.0-80.11.2.el8 (RHEL8.0) + 4.18.0-147.8.1.el8 (RHEL8.1) + 4.4.120-92.70 (SLES12 SP2) + 4.4.180-94.100 (SLES12 SP3) + 4.4.0-131 (Ubuntu 16.04) + 4.15.0-32 (Ubuntu 18.04) + vanilla linux 4.6.7 (ZFS only) * ldiskfs needs an ldiskfs patch series for that kernel, ZFS does not * Client primary unpatched kernels built and tested during release cycle: - 3.10.0-1062.9.1.el7 (RHEL7.7) - 3.10.0-1127.el7 (RHEL7.8) - 4.12.14-95.45 (SLES12 SP4) - 4.12.14-197.37 (SLES15 SP1) - 4.15.0-48 (Ubuntu 18.04) + 3.10.0-1062.18.1.el7 (RHEL7.7) + 3.10.0-1127.el7 (RHEL7.8) + 4.12.14-95.45 (SLES12 SP4) + 4.12.14-197.37 (SLES15 SP1) + 4.15.0-48 (Ubuntu 18.04) * Other clients known to build on unpatched kernels at some point (others may also work): - 3.10.0-862.14.4.el7 (RHEL7.5) - 3.10.0-957.27.2.el7 (RHEL7.6) - 4.14.0-49.13.1.el7a (RHEL7.5) - 4.14.0-115.2.2.el7a (RHEL7.6) - 4.18.0-80.11.2.el8 (RHEL8.0) - 4.18.0-147.8.1.el8 (RHEL8.1) - 4.4.120-92.70 (SLES12 SP2) - 4.4.180-94.100 (SLES12 SP3) - 4.4.0-131 (Ubuntu 16.04) + 3.10.0-862.14.4.el7 (RHEL7.5) + 3.10.0-957.27.2.el7 (RHEL7.6) + 4.14.0-49.13.1.el7a (RHEL7.5) + 4.14.0-115.2.2.el7a (RHEL7.6) + 4.18.0-80.11.2.el8 (RHEL8.0) + 4.18.0-147.8.1.el8 (RHEL8.1) + 4.4.120-92.70 (SLES12 SP2) + 4.4.180-94.100 (SLES12 SP3) + 4.4.0-131 (Ubuntu 16.04) vanilla linux 4.15.0 (ZFS only) * Recommended e2fsprogs version: 1.45.2.wc1 or newer * Recommended ZFS version: 0.8.3 diff --git a/lustre/kernel_patches/series/3.10-rhel7.7.series b/lustre/kernel_patches/series/3.10-rhel7.7.series index 725e620..32c1343 100644 --- a/lustre/kernel_patches/series/3.10-rhel7.7.series +++ b/lustre/kernel_patches/series/3.10-rhel7.7.series @@ -5,5 +5,4 @@ fix-integrity-verify-rhel7.patch fix-sd-dif-complete-rhel7.patch block-integrity-allow-optional-integrity-functions-rhel7.patch block-pass-bio-into-integrity_processing_fn-rhel7.patch -dm-fix-handle-BLK_MQ_RQ_QUEUE_DEV_BUSY-rhel7.6.patch block-Ensure-we-only-enable-integrity-metadata-for-reads-and-writes-rhel7.patch diff --git a/lustre/kernel_patches/targets/3.10-rhel7.7.target.in b/lustre/kernel_patches/targets/3.10-rhel7.7.target.in index e1f68b1..036b174e 100644 --- a/lustre/kernel_patches/targets/3.10-rhel7.7.target.in +++ b/lustre/kernel_patches/targets/3.10-rhel7.7.target.in @@ -1,5 +1,5 @@ lnxmaj="3.10.0" -lnxrel="1062.9.1.el7" +lnxrel="1062.18.1.el7" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=3.10-rhel7.7.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 64ef406..fc15411 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -13,18 +13,18 @@ Servers running only ZFS OSDs DO NOT need any patches. Clients since 2.6.18 DO NOT need any patches. PATCH SERIES FOR SERVER KERNELS: -3.10-rhel7.5.series 3.10.0-862.14.4.el7 (RHEL 7.5) -3.10-rhel7.6.series 3.10.0-957.27.2.el7 (RHEL 7.6) -3.10-rhel7.7.series 3.10.0-1062.9.1.el7 (RHEL 7.7) -3.10-rhel7.8.series 3.10.0-1127.el7 (RHEL 7.8) -4.18-rhel8.series 4.18.0-80.11.2.el8 (RHEL 8.0) -4.18-rhel8.1.series 4.18.0-147.8.1.el8 (RHEL 8.1) -3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) -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.120-92.70 (SLES12 SP2) -4.4-sles12sp3.series 4.4.180-94.100 (SLES12 SP3) -4.4-ubuntu14+16.series 4.4.0-85.108 (Ubuntu 14.04.5 LTS) -4.4-ubuntu14+16.series 4.4.0-85.108 (Ubuntu 16.04) +3.10-rhel7.5.series 3.10.0-862.14.4.el7 (RHEL 7.5) +3.10-rhel7.6.series 3.10.0-957.27.2.el7 (RHEL 7.6) +3.10-rhel7.7.series 3.10.0-1062.18.1.el7 (RHEL 7.7) +3.10-rhel7.8.series 3.10.0-1127.el7 (RHEL 7.8) +4.18-rhel8.series 4.18.0-80.11.2.el8 (RHEL 8.0) +4.18-rhel8.1.series 4.18.0-147.8.1.el8 (RHEL 8.1) +3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) +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.120-92.70 (SLES12 SP2) +4.4-sles12sp3.series 4.4.180-94.100 (SLES12 SP3) +4.4-ubuntu14+16.series 4.4.0-85.108 (Ubuntu 14.04.5 LTS) +4.4-ubuntu14+16.series 4.4.0-85.108 (Ubuntu 16.04) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1