From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Thu, 21 Jun 2012 15:27:43 +0000 (-0700)
Subject: SPEC: v2.6.39-200.22.1
X-Git-Tag: v2.6.39-400.9.0~516^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8db44677812d1a3b0bf340feb211a730bdb233ca;p=users%2Fjedix%2Flinux-maple.git

SPEC: v2.6.39-200.22.1

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 8582a691f664..7cc068c42cc1 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}.21.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.22.1%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1680,6 +1680,14 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jun 21 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.22.1.el5uek]
+- NFSv4: include bitmap in nfsv4 get acl data (Andy Adamson)  {CVE-2011-4131}
+- ocfs2:btrfs: aio-dio-loop changes broke setrlimit behavior [orabug 14207636]
+  (Dave Kleikamp)
+- Add Oracle VM guest messaging driver (Zhigang Wang)
+- thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE (Andrea Arcangeli)
+  [Orabug: 14217003]
+
 * Tue Jun 19 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.21.0.el5uek]
 - KVM: Fix buffer overflow in kvm_set_irq() (Avi Kivity) [Bugdb: 13966]
   {CVE-2012-2137}
diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index a8630db17f22..11413ce2c982 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}.21.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.22.1%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
@@ -1692,6 +1692,14 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jun 21 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.22.1.el6uek]
+- NFSv4: include bitmap in nfsv4 get acl data (Andy Adamson)  {CVE-2011-4131}
+- ocfs2:btrfs: aio-dio-loop changes broke setrlimit behavior [orabug 14207636]
+  (Dave Kleikamp)
+- Add Oracle VM guest messaging driver (Zhigang Wang)
+- thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE (Andrea Arcangeli)
+  [Orabug: 14217003]
+
 * Tue Jun 19 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.21.0.el6uek]
 - KVM: Fix buffer overflow in kvm_set_irq() (Avi Kivity) [Bugdb: 13966]
   {CVE-2012-2137}