From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Tue, 5 Jun 2012 19:25:22 +0000 (+0400)
Subject: SPEC: v2.6.39-200.16.0
X-Git-Tag: v2.6.39-400.9.0~423^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=be2e2da853edeb2e2429b6e892c73dc3918dae91;p=users%2Fjedix%2Flinux-maple.git

SPEC: v2.6.39-200.16.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 507b5cfb52b7..65b06b64fb3d 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}.15.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.16.0%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1680,6 +1680,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jun 05 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.16.0.el5uek]
+- xen/gntdev: Fix merge error. (Konrad Rzeszutek Wilk)
+
 * Fri Jun 01 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.15.0.el5uek]
 - xen: expose host uuid via sysfs. (Zhigang Wang)
 
diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 025abf90b2df..348da2ccce6b 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}.15.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.16.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
+* Tue Jun 05 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.16.0.el6uek]
+- xen/gntdev: Fix merge error. (Konrad Rzeszutek Wilk)
+
 * Fri Jun 01 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.15.0.el6uek]
 - xen: expose host uuid via sysfs. (Zhigang Wang)