From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Fri, 8 Jun 2012 07:29:29 +0000 (+0400)
Subject: SPEC: v2.6.39-200.18.0
X-Git-Tag: v2.6.39-400.9.0~423^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=79087584f0f258da129c441dab108b8eb3cea8d4;p=users%2Fjedix%2Flinux-maple.git

SPEC: v2.6.39-200.18.0

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
---

diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec
index c71faed09a59..84c95dc0c01e 100644
--- a/uek-rpm/ol5/kernel-uek.spec
+++ b/uek-rpm/ol5/kernel-uek.spec
@@ -190,7 +190,7 @@ Summary: The Linux kernel
 %endif
 
 %if %{rhel}
-%define pkg_release %{distro_build}.17.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.18.0%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1680,7 +1680,11 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Wed Jun 06 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.17.0.el6uek]
+* Fri Jun 08 2012 Maxim Uvarov <maxim.uvarov@oracle.com>  [2.6.39-200.18.0.el5uek]
+- e1000e: disable rxhash when try to enable jumbo frame also rxhash and rxcsum
+  have enabled (Joe Jin)
+
+* Wed Jun 06 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.17.0.el5uek]
 - mm: reduce the amount of work done when updating min_free_kbytes (Mel Gorman)
   [Orabug: 14073214]
 - ocfs2: clear unaligned io flag when dio fails (Junxiao Bi) [Orabug: 14063941]
diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index f427736f9700..4c7436223e0a 100644
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -198,7 +198,7 @@ Summary: The Linux kernel
 %endif
 
 %if %{rhel}
-%define pkg_release %{distro_build}.17.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.18.0%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
@@ -1692,6 +1692,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jun 08 2012 Maxim Uvarov <maxim.uvarov@oracle.com>  [2.6.39-200.17.0.el6uek]
+- e1000e: disable rxhash when try to enable jumbo frame also rxhash and rxcsum
+  have enabled (Joe Jin)
+
 * Wed Jun 06 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.17.0.el6uek]
 - mm: reduce the amount of work done when updating min_free_kbytes (Mel Gorman)
   [Orabug: 14073214]