From: Joe Jin Date: Fri, 6 Jul 2012 11:07:18 +0000 (+0800) Subject: SPEC: v2.6.39-200.29.1 X-Git-Tag: v2.6.39-400.9.0~499^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=090dfc37c60f54d8eed5a63a0edf8929da13e2eb;p=users%2Fjedix%2Flinux-maple.git SPEC: v2.6.39-200.29.1 Signed-off-by: Joe Jin --- diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec index f6eac3915e2d..0bdfc0bf2759 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}.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 [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 [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 ed4acc03a3d3..b12383963889 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}.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 [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 [2.6.39-200.28.1.el6uek] - Update hrtimer base offsets each hrtimer_interrupt(John Stultz) [Orabug: 14264454]