From 1c50f88d566fab3a1d96932d9fc980df2e41b168 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 30 Apr 2019 09:23:53 -0700 Subject: [PATCH] LU-12139 kernel: kernel update [SLES12 SP3 4.4.176-94.88] Update SLES12 SP3 kernel to 4.4.176-94.88. Test-Parameters: trivial clientdistro=sles12sp3 serverdistro=sles12sp3 Change-Id: Iecf77e056fc571eb5118ac8c96d440e5f3ceebc0 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/34670 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config | 5 +++-- lustre/kernel_patches/targets/4.4-sles12sp3.target.in | 6 +++--- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 1a21623..519b72e 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.10.1.el7 (RHEL7.6) 4.4.120-92.70 (SLES12 SP2) - 4.4.162-94.69 (SLES12 SP3) + 4.4.176-94.88 (SLES12 SP3) 4.4.0-131 (Ubuntu 16.04) 4.15.0-32 (Ubuntu 18.04) vanilla linux 4.6.7 (ZFS only) @@ -20,7 +20,7 @@ TBD Whamcloud 4.14.0-49.13.1.el7a (RHEL7.5) 4.14.0-115.2.2.el7a (RHEL7.6) 4.4.120-92.70 (SLES12 SP2) - 4.4.162-94.69 (SLES12 SP3) + 4.4.176-94.88 (SLES12 SP3) 4.12.14-95.13 (SLES12 SP4) 4.4.0-131 (Ubuntu 16.04) 4.15.0-32 (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..2b1f56c 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.176 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.88-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 diff --git a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in index b3d6caa..11bf3c8 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=".176" +lnxrel="94.88" # 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 1c0d837..a24cfec 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.176-94.88 (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