SPEC: v2.6.39-300.12.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 4eaced21b36b23409c228429b8390d0e21cdd414..bd2d0a3c7fe0b89a3241dac1d039568d889ab5bd 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}.11.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.12.0%{?dist}uek%{?buildid}
 
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
@@ -1681,6 +1681,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Oct 04 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-300.12.0.el5uek]
+- xen/m2p: do not reuse kmap_op->dev_bus_addr (Stefano Stabellini) [Orabug: 14706608]
+
 * Mon Oct 01 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-300.11.0.el5uek]
 - xen/boot: Disable BIOS SMP MP table search. (Konrad Rzeszutek Wilk) [Bugdb:
   13665]

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 69b33caf8b198bbff36061bbbdd211b0c937fc66..6c599a11e8cf8f5e797a0d70ac64c3a899325083 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}.11.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.12.0%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
@@ -1692,6 +1692,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Oct 04 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-300.12.0.el6uek]
+- xen/m2p: do not reuse kmap_op->dev_bus_addr (Stefano Stabellini) [Orabug: 14706608]
+
 * Mon Oct 01 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-300.11.0.el6uek]
 - xen/boot: Disable BIOS SMP MP table search. (Konrad Rzeszutek Wilk) [Bugdb:
   13665]