SPEC: v2.6.39-200.26.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 1861da17cc6cc472c5abcf2d093dce9992d69f2c..93bb1e5ec1239b2726e04d12512be6e7dd25d683 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}.25.1%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.26.1%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1680,6 +1680,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jul 05 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.26.1.el5uek]
+- Fix leapsecond triggered hrtimer/futex load spike issue (John Stultz)
+- Fix clock_was_set so it is safe to call from atomic (John Stultz)
+
 * Wed Jul 04 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.25.1.el5uek]
 - dm-nfs: force random mode for the backend file (Joe Jin) [Orabug: 14092678]
 

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 18ddc69c5c44981935340d7478ecaca6f3780eb8..bb15dd16851015fa00d88a3e8d63dc4ba8209520 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}.25.1%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.26.1%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
@@ -1692,6 +1692,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jul 05 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.26.1.el6uek]
+- Fix leapsecond triggered hrtimer/futex load spike issue (John Stultz)
+- Fix clock_was_set so it is safe to call from atomic (John Stultz)
+
 * Wed Jul 04 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.25.1.el6uek]
 - dm-nfs: force random mode for the backend file (Joe Jin) [Orabug: 14092678]