From c2b788e7bfc387739a5f2e661920f0140cbc9eee Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Fri, 23 Mar 2018 13:40:28 -0700 Subject: [PATCH] LU-10845 kernel: kernel update [SLES12 SP3 4.4.120-94.17] Update target and kernel_config files for new version Test-Parameters: clientdistro=sles12sp3 testgroup=review-ldiskfs \ mdsdistro=sles12sp3 ossdistro=sles12sp3 \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Signed-off-by: Bob Glossman Change-Id: I45c1a65c5ef5373201d8b2a1c457bfa2b37df058 Reviewed-on: https://review.whamcloud.com/31762 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config | 9 +++++++-- lustre/kernel_patches/targets/4.4-sles12sp3.target.in | 10 +++------- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 23e77aa..f651475 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -64,7 +64,7 @@ TBD Intel Corporation 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) 4.4.114-92.64 (SLES12 SP2) - 4.4.114-94.11 (SLES12 SP3) + 4.4.120-94.17 (SLES12 SP3) 3.13.0-101 (Ubuntu 14.04, ZFS only) 4.4.0-85.108 (Ubuntu 14.04.5 LTS) 4.4.0-116 (Ubuntu 16.04) @@ -80,7 +80,7 @@ TBD Intel Corporation 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) 4.4.114-92.64 (SLES12 SP2) - 4.4.114-94.11 (SLES12 SP3) + 4.4.120-94.17 (SLES12 SP3) 3.13.0-101 (Ubuntu 14.04) 4.4.0-85.108 (Ubuntu 14.04.5 LTS) 4.4.0-116 (Ubuntu 16.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 0dfc599..b6d8c27 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.114 Kernel Configuration +# Linux/x86 4.4.120 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="-94.11-default" +CONFIG_LOCALVERSION="-94.17-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -226,6 +226,7 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_BPF_SYSCALL=y +# CONFIG_BPF_JIT_ALWAYS_ON is not set CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y @@ -1664,9 +1665,11 @@ CONFIG_NFC_NXP_NCI_I2C=m CONFIG_NFC_S3FWRN5=m CONFIG_NFC_S3FWRN5_I2C=m CONFIG_LWTUNNEL=y +CONFIG_DST_CACHE=y CONFIG_NET_DEVLINK=m CONFIG_MAY_USE_DEVLINK=m CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_EBPF_JIT=y # # Device Drivers @@ -2740,6 +2743,7 @@ CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m CONFIG_USB_NET_CDC_SUBSET=m CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y @@ -5821,6 +5825,7 @@ CONFIG_VIRTIO_MMIO=m # Microsoft Hyper-V guest support # CONFIG_HYPERV=m +CONFIG_HYPERV_TSCPAGE=y CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_BALLOON=m diff --git a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in index b9cedec..5a0d277 100644 --- a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in @@ -1,14 +1,10 @@ lnxmaj="4.4" -lnxmin=".114" -lnxrel="94.11" +lnxmin=".120" +lnxrel="94.17" # 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" -# for some odd reasons (bug??) -devel and source have different fix -# so we'll add another one to detect this, make it the same or remove -# this change they fix the bug -rpmfix_diff=".3" +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 e934d43..5f8fc6a 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -23,7 +23,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.114-92.64 (SLES12 SP2) -4.4-sles12sp3.series 4.4.114-94.11 (SLES12 SP3) +4.4-sles12sp3.series 4.4.120-94.17 (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