From: Bob Glossman <bob.glossman@intel.com>
Date: Thu, 25 May 2017 15:06:11 +0000 (-0700)
Subject: LU-9561 kernel: kernel update RHEL7.3 [3.10.0-514.21.1.el7]
X-Git-Tag: 2.9.59~15
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=a933ef10b723207ac9b90862775e39b9e24138d5

LU-9561 kernel: kernel update RHEL7.3 [3.10.0-514.21.1.el7]

update RHEL 7.3 kernel to 3.10.0-514.21.1.el7

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: I847074a5afb79d33e88fcaf822c6ccef0b78585a
Reviewed-on: https://review.whamcloud.com/27303
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/lustre/ChangeLog b/lustre/ChangeLog
index 8dfdfb9..673a620 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -8,7 +8,7 @@ TBD Intel Corporation
          2.6.32-573.26.1.el6 (RHEL6.7)
          2.6.32-642.15.1.el6 (RHEL6.8)
          2.6.32-696.1.1.el6  (RHEL6.9)
-         3.10.0-514.16.1.el7 (RHEL7.3)
+         3.10.0-514.21.1.el7 (RHEL7.3)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-100         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
@@ -20,7 +20,7 @@ TBD Intel Corporation
          2.6.32-573.26.1.el6 (RHEL6.7)
          2.6.32-642.15.1.el6 (RHEL6.8)
          2.6.32-696.1.1.el6  (RHEL6.9)
-         3.10.0-514.16.1.el7 (RHEL7.3)
+         3.10.0-514.21.1.el7 (RHEL7.3)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-100         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
diff --git a/lustre/kernel_patches/series/3.10-rhel7.series b/lustre/kernel_patches/series/3.10-rhel7.series
index 0cdbc20..24abd03 100644
--- a/lustre/kernel_patches/series/3.10-rhel7.series
+++ b/lustre/kernel_patches/series/3.10-rhel7.series
@@ -1,5 +1,4 @@
 raid5-mmp-unplug-dev-3.7.patch
 dev_read_only-3.7.patch
 blkdev_tunables-3.8.patch
-jbd2-fix-j_list_lock-unlock-3.10-rhel7.patch
 vfs-project-quotas-rhel7.patch
diff --git a/lustre/kernel_patches/targets/3.10-rhel7.target.in b/lustre/kernel_patches/targets/3.10-rhel7.target.in
index 7479ac3..3adc48f 100644
--- a/lustre/kernel_patches/targets/3.10-rhel7.target.in
+++ b/lustre/kernel_patches/targets/3.10-rhel7.target.in
@@ -1,5 +1,5 @@
 lnxmaj="3.10.0"
-lnxrel="514.16.1.el7"
+lnxrel="514.21.1.el7"
 
 KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 SERIES=3.10-rhel7.series
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index f65efea..5bdb778 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -18,7 +18,7 @@ PATCH SERIES FOR SERVER KERNELS:
 2.6-rhel6.series        2.6.32-573.26.1.el6 (RHEL 6.7)
 2.6-rhel6.8.series      2.6.32-642.15.1.el6 (RHEL 6.8)
 2.6-rhel6.8.series      2.6.32-696.1.1.el6  (RHEL 6.9)
-3.10-rhel7.series       3.10.0-514.16.1.el7 (RHEL 7.3)
+3.10-rhel7.series       3.10.0-514.21.1.el7 (RHEL 7.3)
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 3.0-sles11sp3.series    3.0.101-100         (SLES11 SP4)
 3.12-sles12.series      3.12.74-60.64.40    (SLES12 SP1)