From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Fri, 30 Mar 2012 23:55:26 +0000 (-0700)
Subject: SPEC: v2.6.39-300.0.2
X-Git-Tag: v2.6.39-400.9.0~544
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e6b402fe46385eb49dbe44085d51faf490955d99;p=users%2Fjedix%2Flinux-maple.git

SPEC: v2.6.39-300.0.2

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 043757bbc95c..b77c741f1ded 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}.0.1%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.2%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1680,6 +1680,12 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Mar 30 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-300.0.2.el5uek]
+- vlan: allow nested vlan_do_receive() (Maxim Uvarov)
+- net: allow vlan traffic to be received under bond (John Fastabend)
+- net: vlan: goto another_round instead of calling __netif_receive_skb (Jiri
+  Pirko)
+
 * Thu Mar 29 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-300.0.1.el5uek]
 - Add an additional signing key for signing Ksplice modules for modsign.
   (Nelson Elhage)
diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 73868c365190..ff9c46c4bf4b 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}.0.1%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.2%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
@@ -1692,7 +1692,13 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Thue Mar 29 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-300.0.1.el6uek]
+* Fri Mar 30 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-300.0.2.el6uek]
+- vlan: allow nested vlan_do_receive() (Maxim Uvarov)
+- net: allow vlan traffic to be received under bond (John Fastabend)
+- net: vlan: goto another_round instead of calling __netif_receive_skb (Jiri
+  Pirko)
+
+* Thu Mar 29 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-300.0.1.el6uek]
 - Add an additional signing key for signing Ksplice modules for modsign.
   (Nelson Elhage)
 - Revert "loop: increase default number of loop devices to 512" (Maxim Uvarov)