From e2aa51c7f88d0db6e40a99d75f9d5161bb762c8c Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Fri, 23 Mar 2018 15:53:18 -0700 Subject: [PATCH] LU-10847 kernel update [SLES12 SP2 4.4.120-92.70] Update target and kernel_config files for new version Test-Parameters: clientdistro=sles12sp2 testgroup=review-ldiskfs \ mdsdistro=sles12sp2 ossdistro=sles12sp2 \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Signed-off-by: Bob Glossman Change-Id: I24892ca2360370ede3ca7f909f2e2b1e2275870a Reviewed-on: https://review.whamcloud.com/31764 Reviewed-by: James Nunez Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild-sles12 | 4 ++-- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-4.4-4.4-sles12-x86_64.config | 8 ++++++-- lustre/kernel_patches/targets/4.4-sles12.target.in | 4 ++-- lustre/kernel_patches/which_patch | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12 index 117b6e5..8bc8b73 100644 --- a/contrib/lbuild/lbuild-sles12 +++ b/contrib/lbuild/lbuild-sles12 @@ -23,7 +23,7 @@ kernel_srpm_location() { 4.4) kminor=${lnxmin##.} kdir=updates-sles12.2-src - if [ $kminor -eq 114 ] + if [ $kminor -eq 114 -o $kminor -eq 120 ] then if [ ${lnxrel%%.*} -gt 92 ] then @@ -166,7 +166,7 @@ find_linux_rpm-sles12() { 4.4) kminor=${lnxmin##.} kdir=updates-sles12.2-x86_64 - if [ $kminor -eq 114 ] + if [ $kminor -eq 114 -o $kminor -eq 120 ] then if [ ${lnxrel%%.*} -gt 92 ] then diff --git a/lustre/ChangeLog b/lustre/ChangeLog index f651475..01fe958 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -63,7 +63,7 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.114-92.64 (SLES12 SP2) + 4.4.120-92.70 (SLES12 SP2) 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) @@ -79,7 +79,7 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-107 (SLES11 SP4) 3.12.74-60.64.40 (SLES12 SP1) - 4.4.114-92.64 (SLES12 SP2) + 4.4.120-92.70 (SLES12 SP2) 4.4.120-94.17 (SLES12 SP3) 3.13.0-101 (Ubuntu 14.04) 4.4.0-85.108 (Ubuntu 14.04.5 LTS) diff --git a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config index 7c2e6e8..9b26fa8 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-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="-92.64-default" +CONFIG_LOCALVERSION="-92.70-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -224,6 +224,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 @@ -1650,7 +1651,9 @@ CONFIG_NFC_NXP_NCI_I2C=m CONFIG_NFC_S3FWRN5=m CONFIG_NFC_S3FWRN5_I2C=m CONFIG_LWTUNNEL=y +CONFIG_DST_CACHE=y CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_EBPF_JIT=y # # Device Drivers @@ -2704,6 +2707,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 diff --git a/lustre/kernel_patches/targets/4.4-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in index 2b45da0..7b1c1da 100644 --- a/lustre/kernel_patches/targets/4.4-sles12.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12.target.in @@ -1,6 +1,6 @@ lnxmaj="4.4" -lnxmin=".114" -lnxrel="92.64" +lnxmin=".120" +lnxrel="92.70" # 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 diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 5f8fc6a..9dd0718 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -22,7 +22,7 @@ PATCH SERIES FOR SERVER KERNELS: 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.114-92.64 (SLES12 SP2) +4.4-sles12.series 4.4.120-92.70 (SLES12 SP2) 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