From 1c2b3b945c19e7e65bc57caf6e84582d7794b6ec Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Wed, 3 Jul 2019 16:30:47 -0700 Subject: [PATCH] LU-12498 kernel: kernel update [SLES12 SP3 4.4.180-94.97] Update SLES12 SP3 kernel to 4.4.180-94.97. Test-Parameters: trivial clientdistro=sles12sp3 serverdistro=sles12sp3 Change-Id: Ia545ff0a54d9cf483a38842f0f7bf42b1fda6875 Signed-off-by: Jian Yu Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/35416 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config | 8 ++++++-- lustre/kernel_patches/targets/4.4-sles12sp3.target.in | 6 +++--- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 2a68ca2..e8581e3 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -7,7 +7,7 @@ TBD Whamcloud 3.10.0-862.14.4.el7 (RHEL7.5) 3.10.0-957.21.3.el7 (RHEL7.6) 4.4.120-92.70 (SLES12 SP2) - 4.4.162-94.69 (SLES12 SP3) + 4.4.180-94.97 (SLES12 SP3) 4.4.0-142 (Ubuntu 16.04) 4.15.0-45 (Ubuntu 18.04) vanilla linux 4.6.7 (ZFS only) @@ -21,7 +21,7 @@ TBD Whamcloud 4.14.0-115.2.2.el7a (RHEL7.6) 4.18.0-80.4.2.el8 (RHEL8.0) 4.4.120-92.70 (SLES12 SP2) - 4.4.162-94.69 (SLES12 SP3) + 4.4.180-94.97 (SLES12 SP3) 4.12.14-95.19 (SLES12 SP4) 4.4.0-142 (Ubuntu 16.04) 4.15.0-45 (Ubuntu 18.04) diff --git a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config index 5d6827e..3305ee3 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.162 Kernel Configuration +# Linux/x86 4.4.180 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -53,7 +53,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-94.69-default" +CONFIG_LOCALVERSION="-94.97-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -1570,6 +1570,7 @@ CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y @@ -3383,6 +3384,7 @@ CONFIG_N_HDLC=m CONFIG_N_GSM=m CONFIG_TRACE_ROUTER=m CONFIG_TRACE_SINK=m +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y CONFIG_DEVKMEM=y @@ -6003,6 +6005,7 @@ CONFIG_INTEL_IOMMU_SVM=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_IRQ_REMAP=y +CONFIG_HYPERV_IOMMU=y # # Remoteproc drivers @@ -7005,6 +7008,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set +CONFIG_CRC64=m CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m diff --git a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in index b3d6caa..e7e927a 100644 --- a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in @@ -1,10 +1,10 @@ lnxmaj="4.4" -lnxmin=".162" -lnxrel="94.69" +lnxmin=".180" +lnxrel="94.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 -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 f6e0bbf..0667ecd 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -24,7 +24,7 @@ PATCH SERIES FOR SERVER KERNELS: 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.162-94.69 (SLES12 SP3) +4.4-sles12sp3.series 4.4.180-94.97 (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) -- 1.8.3.1