SPEC: v2.6.39-200.29.1

Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec
index f6eac3915e2d0a20a603e4bc12d59f159e3f77a3..0bdfc0bf27590561204475cecc1ee31fae3dfcc4 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}.28.1%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.29.1%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1680,6 +1680,14 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jul 06 2012 Joe Jin <joe.jin@oracle.come> [2.6.39-200.29.1.el5uek]
+- 3.0.x: hrtimer: Update hrtimer base offsets each hrtimer_interrupt (John Stultz)
+- 3.0.x: time: Fix leapsecond triggered hrtimer/futex load spike issue (John Stultz)
+- 3.0.x: hrtimer: Fix clock_was_set so it is safe to call from irq context (John Stultz)
+- Revert "Fix clock_was_set so it is safe to call from atomic"
+- Revert "Fix leapsecond triggered hrtimer/futex load spike issue"
+- Revert "3.0.x: hrtimer: Update hrtimer base offsets each hrtimer_interrupt"
+
 * Fri Jul 06 2012 Joe Jin <joe.jin@oracle.come> [2.6.39-200.28.1.el5uek]
 - Update hrtimer base offsets each hrtimer_interrupt(John Stultz) [Orabug: 14264454]
 

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index ed4acc03a3d35271433c1d75d6b32a7162a1698b..b12383963889f5951a5d2d1bf194bce93a536449 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}.28.1%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.29.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
+* Fri Jul 06 2012 Joe Jin <joe.jin@oracle.come> [2.6.39-200.29.1.el6uek]
+- 3.0.x: hrtimer: Update hrtimer base offsets each hrtimer_interrupt (John Stultz)
+- 3.0.x: time: Fix leapsecond triggered hrtimer/futex load spike issue (John Stultz)
+- 3.0.x: hrtimer: Fix clock_was_set so it is safe to call from irq context (John Stultz)
+- Revert "Fix clock_was_set so it is safe to call from atomic"
+- Revert "Fix leapsecond triggered hrtimer/futex load spike issue"
+- Revert "3.0.x: hrtimer: Update hrtimer base offsets each hrtimer_interrupt"
+
 * Fri Jul 06 2012 Joe Jin <joe.jin@oracle.come> [2.6.39-200.28.1.el6uek]
 - Update hrtimer base offsets each hrtimer_interrupt(John Stultz) [Orabug: 14264454]