From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Wed, 23 May 2012 21:40:26 +0000 (-0700)
Subject: SPEC: v2.6.39-200.12.0
X-Git-Tag: v2.6.39-400.9.0~423^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5464c33c931d792109566fafb051a03ac94987b8;p=users%2Fjedix%2Flinux-maple.git

SPEC: v2.6.39-200.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 e5696f62bf07..9c783385ddb9 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}.11.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.12.0%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1680,7 +1680,16 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Thu May 17 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.11.0.el6uek]
+* Wed May 23 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.12.0.el5uek]
+- Revert "x86, efi: Pass a minimal map to SetVirtualAddressMap()" (Maxim
+  Uvarov) [Orabug: 14076004]
+- config: turn on CONFIG_HVC_XEN_FRONTEND (Maxim Uvarov) [Orabug: 14064174]
+- xen/hvc: Check HVM_PARAM_CONSOLE_[EVTCHN|PFN] for correctness. (Konrad
+  Rzeszutek Wilk)
+- xen/hvc: Fix error cases around HVM_PARAM_CONSOLE_PFN (Konrad Rzeszutek Wilk)
+- xen/hvc: Collapse error logic. (Konrad Rzeszutek Wilk)
+
+* Thu May 17 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.11.0.el5uek]
 - [dm] do not forward ioctls from logical volumes to the underlying device (Joe
   Jin)  {CVE-2011-4127}
 - [block] fail SCSI passthrough ioctls on partition devices (Joe Jin)
diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 9cea205839a5..a128bea035ae 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}.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,15 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed May 23 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.12.0.el6uek]
+- Revert "x86, efi: Pass a minimal map to SetVirtualAddressMap()" (Maxim
+  Uvarov) [Orabug: 14076004]
+- config: turn on CONFIG_HVC_XEN_FRONTEND (Maxim Uvarov) [Orabug: 14064174]
+- xen/hvc: Check HVM_PARAM_CONSOLE_[EVTCHN|PFN] for correctness. (Konrad
+  Rzeszutek Wilk)
+- xen/hvc: Fix error cases around HVM_PARAM_CONSOLE_PFN (Konrad Rzeszutek Wilk)
+- xen/hvc: Collapse error logic. (Konrad Rzeszutek Wilk)
+
 * Thu May 17 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.11.0.el6uek]
 - [dm] do not forward ioctls from logical volumes to the underlying device (Joe
   Jin)  {CVE-2011-4127}