LU-9773 kernel: kernel update [SLES12 SP2 4.4.74-92.29]

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 <bob.glossman@intel.com>
Change-Id: I42107acb5a12f5200d3cb58121d10ffdc1dbc6d2
Reviewed-on: https://review.whamcloud.com/28043
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-fix-xattr-shifting-when-expanding-inodes.patch b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-fix-xattr-shifting-when-expanding-inodes.patch
index 51a6cda..fa282ff 100644 (file)
--- a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-fix-xattr-shifting-when-expanding-inodes.patch
+++ b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-fix-xattr-shifting-when-expanding-inodes.patch
@@ -173,38 +173,3 @@ Index: linux-4.4.49-92.14_lustre-vanilla/fs/ext4/xattr.c
        brelse(bh);
  out:
        ext4_clear_inode_state(inode, EXT4_STATE_NO_EXPAND);
-From 887a9730614727c4fff7cb756711b190593fc1df Mon Sep 17 00:00:00 2001
-From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Date: Sun, 21 May 2017 22:36:23 -0400
-Subject: [PATCH] ext4: keep existing extra fields when inode expands
-
-ext4_expand_extra_isize() should clear only space between old and new
-size.
-
-Fixes: 6dd4ee7cab7e # v2.6.23
-Cc: stable@vger.kernel.org
-Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- fs/ext4/inode.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
-index 1bd0bfa..7cd99de 100644
---- a/fs/ext4/inode.c
-+++ b/fs/ext4/inode.c
-@@ -5637,8 +5637,9 @@ static int ext4_expand_extra_isize(struct inode *inode,
-       /* No extended attributes present */
-       if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR) ||
-           header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)) {
--              memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE, 0,
--                      new_extra_isize);
-+              memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE +
-+                     EXT4_I(inode)->i_extra_isize, 0,
-+                     new_extra_isize - EXT4_I(inode)->i_extra_isize);
-               EXT4_I(inode)->i_extra_isize = new_extra_isize;
-               return 0;
-       }
--- 
-2.9.3
-

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 896b125..cdcf645 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -12,7 +12,7 @@ TBD Intel Corporation
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-100         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
-         4.4.59-92.17        (SLES12 SP2)
+         4.4.74-92.29        (SLES12 SP2)
          vanilla linux 4.6.7 (ZFS only)
        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
@@ -24,7 +24,7 @@ TBD Intel Corporation
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-100         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
-         4.4.59-92.17        (SLES12 SP2)
+         4.4.74-92.29        (SLES12 SP2)
          vanilla linux 4.6.7
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer
        * Recommended ZFS / SPL version: 0.6.5.9

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 520a28e..185963a 100644 (file)
--- 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.59 Kernel Configuration
+# Linux/x86 4.4.74 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.17-default"
+CONFIG_LOCALVERSION="-92.29-default"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -2442,8 +2442,8 @@ CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 # CONFIG_CHELSIO_T4_DCB is not set
-CONFIG_CHELSIO_T4_UWIRE=y
 CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_CX_ECAT=m
@@ -2836,6 +2836,7 @@ CONFIG_IWLMVM=m
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
 # CONFIG_IWLWIFI_UAPSD is not set
+CONFIG_IWLWIFI_PCIE_RTPM=y
 
 #
 # Debugging Options

diff --git a/lustre/kernel_patches/targets/4.4-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in
index d33547d..7a9a864 100644 (file)
--- a/lustre/kernel_patches/targets/4.4-sles12.target.in
+++ b/lustre/kernel_patches/targets/4.4-sles12.target.in
@@ -1,14 +1,14 @@
 lnxmaj="4.4"
-lnxmin=".59"
-lnxrel="92.17"
+lnxmin=".74"
+lnxrel="92.29"
 # 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"
 # for some oddly 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_diff=".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 c1807c1..07918d4 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -22,6 +22,6 @@ 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.59-92.17        (SLES12 SP2)
+4.4-sles12.series       4.4.74-92.29        (SLES12 SP2)
 
 See lustre/ChangeLog for supported client kernel versions.