From: Bob Glossman <bob.glossman@intel.com>
Date: Tue, 16 Dec 2014 21:18:19 +0000 (-0800)
Subject: LU-6035 kernel: kernel update RHEL6.6 [2.6.32-504.3.3.el6]
X-Git-Tag: 2.6.92~26
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=649390425135aa2daac9ef381cca2e7c3952892c

LU-6035 kernel: kernel update RHEL6.6 [2.6.32-504.3.3.el6]

Update RHEL6.6 kernel to 2.6.32-504.3.3.el6

Test-Parameters: clientdistro=el6.6 mdsdistro=el6.6\
  ossdistro=el6.6 mdsfilesystemtype=ldiskfs\
  mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: I07f3a84b776e3bcd8f1b7ba2250e0bbb3d47f010
Reviewed-on: http://review.whamcloud.com/13106
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 9655de7..9f10688 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -4,11 +4,11 @@ TBD Intel Corporation
          for currently supported client and server kernel versions.
        * Server known to build on patched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
-         2.6.32-504.1.3.el6  (RHEL6.6)
+         2.6.32-504.3.3.el6  (RHEL6.6)
          3.0.101-0.40        (SLES11 SP3)
        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
-         2.6.32-504.1.3.el6  (RHEL6.6)
+         2.6.32-504.3.3.el6  (RHEL6.6)
          3.10.0-123.9.2.el7  (RHEL7)
          3.0.101-0.40        (SLES11 SP3)
        * Recommended e2fsprogs version: 1.42.9.wc1 or newer
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-i686.config
index 478ad96..3ad7b9b 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-i686.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Thu Oct  2 08:32:18 2014
+# Tue Dec 16 12:04:28 2014
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -4446,7 +4446,6 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
-CONFIG_BH_LRU_SIZE=16
 
 #
 # Kernel hacking
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-x86_64.config
index 628bfc1..51184df 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.6-x86_64.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Thu Oct  2 08:32:18 2014
+# Tue Dec 16 12:04:28 2014
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -4276,7 +4276,6 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
-CONFIG_BH_LRU_SIZE=16
 
 #
 # Kernel hacking
diff --git a/lustre/kernel_patches/targets/2.6-rhel6.6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.6.target.in
index 355e984..9c60440 100644
--- a/lustre/kernel_patches/targets/2.6-rhel6.6.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel6.6.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.32"
-lnxrel="504.1.3.el6"
+lnxrel="504.3.3.el6"
 
 KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 SERIES=2.6-rhel6.series
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 85e75c6..e231532 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -14,7 +14,7 @@ Clients since 2.6.18 DO NOT need any patches.
 
 PATCH SERIES FOR SERVER KERNELS:
 2.6-rhel6.series        2.6.32-431.29.2.el6 (RHEL 6.5)
-2.6-rhel6.series        2.6.32-504.1.3.el6  (RHEL 6.6)
+2.6-rhel6.series        2.6.32-504.3.3.el6  (RHEL 6.6)
 3.0-sles11sp3.series    3.0.101-0.40        (SLES11 SP3)
 
 See lustre/ChangeLog for supported client kernel versions.