SPEC: v2.6.39-200.0.13

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 1e515924aa1729fd3811d7e2804c102bc684047c..4a36b1fc4cd32a08fd4b7730173aeae589464c99 100644 (file)
--- 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.12%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.13%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1680,6 +1680,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 2 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.0.13.el5uek]
+- fix git merge: vlan: allow nested vlan_do_receive() (Maxim Uvarov)
+- SPEC: update and turn on kabi (Maxim Uvarov)
+
 * Mon Apr 2 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.0.12.el5uek]
 - remove unused mutex hpidebuglock (Maxim Uvarov)
 - add hxge-1.3.3 driver (Maxim Uvarov)

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index f0de4b63b996f39df9ce6335733717120b79d4fd..4cab5c5f9ed81d1bd5ca12d4d18f03e43ef3b525 100644 (file)
--- 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.12%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.13%{?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
+* Mon Apr 2 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.0.13.el6uek]
+- fix git merge: vlan: allow nested vlan_do_receive() (Maxim Uvarov)
+- SPEC: update and turn on kabi (Maxim Uvarov)
+
 * Mon Apr 2 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.0.12.el6uek]
 - remove unused mutex hpidebuglock (Maxim Uvarov)
 - add hxge-1.3.3 driver (Maxim Uvarov)