From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Thu, 22 Mar 2012 00:23:10 +0000 (-0700)
Subject: SPEC: v2.6.39-200.0.4
X-Git-Tag: v2.6.39-400.9.0~582
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=119df3db6eb5586bb8f862a8fe1a9076ce320be6;p=users%2Fjedix%2Flinux-maple.git

SPEC: v2.6.39-200.0.4

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 27acd8645e56..8a5c9e024218 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}.0.3%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.4%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1676,6 +1676,14 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Mar 21 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.0.4.el5uek]
+- ocfs2/trivial: Print message indicating unaligned aio+dio write (Sunil
+  Mushran)
+- ocfs2: Avoid livelock in ocfs2_readpage() (Jan Kara)
+- ocfs2: serialize unaligned aio (Mark Fasheh)
+- ocfs2: null deref on allocation error (Dan Carpenter)
+- ocfs2: Bugfix for hard readonly mount (Tiger Yang)
+
 * Mon Mar 19 2012 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-200.0.3.el5uek]
 - xen/blkback: Disable DISCARD support for loopback device (but leave for phy).
   (Konrad Rzeszutek Wilk)
diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 95860f9f5583..58d6cd7b68f8 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}.0.3%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.4%{?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
+* Mon Mar 21 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.0.4.el6uek]
+- ocfs2/trivial: Print message indicating unaligned aio+dio write (Sunil
+  Mushran)
+- ocfs2: Avoid livelock in ocfs2_readpage() (Jan Kara)
+- ocfs2: serialize unaligned aio (Mark Fasheh)
+- ocfs2: null deref on allocation error (Dan Carpenter)
+- ocfs2: Bugfix for hard readonly mount (Tiger Yang)
+
 * Mon Mar 19 2012 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-200.0.3.el6uek]
 - xen/blkback: Disable DISCARD support for loopback device (but leave for phy).
   (Konrad Rzeszutek Wilk)