From: Maxim Uvarov Date: Tue, 3 Apr 2012 00:30:53 +0000 (-0700) Subject: SPEC: v2.6.39-200.0.13 X-Git-Tag: v2.6.39-400.9.0~426^2~31 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fd17147ed82447d5f71c98f7eefba1b0122c1bf9;p=users%2Fjedix%2Flinux-maple.git SPEC: v2.6.39-200.0.13 Signed-off-by: Maxim Uvarov --- diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec index 1e515924aa17..4a36b1fc4cd3 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.12%{?dist}uek%{?buildid} +%define pkg_release %{distro_build}.0.13%{?dist}uek%{?buildid} %endif %define KVERREL %{rpmversion}-%{pkg_release} @@ -1680,6 +1680,10 @@ fi %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Mon Apr 2 2012 Maxim Uvarov [2.6.39-200.0.13.el5uek] +- fix git merge: vlan: allow nested vlan_do_receive() (Maxim Uvarov) +- SPEC: update and turn on kabi (Maxim Uvarov) + * Mon Apr 2 2012 Maxim Uvarov [2.6.39-200.0.12.el5uek] - remove unused mutex hpidebuglock (Maxim Uvarov) - add hxge-1.3.3 driver (Maxim Uvarov) diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec index f0de4b63b996..4cab5c5f9ed8 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.12%{?dist}uek%{?buildid} +%define pkg_release %{distro_build}.0.13%{?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 +* Mon Apr 2 2012 Maxim Uvarov [2.6.39-200.0.13.el6uek] +- fix git merge: vlan: allow nested vlan_do_receive() (Maxim Uvarov) +- SPEC: update and turn on kabi (Maxim Uvarov) + * Mon Apr 2 2012 Maxim Uvarov [2.6.39-200.0.12.el6uek] - remove unused mutex hpidebuglock (Maxim Uvarov) - add hxge-1.3.3 driver (Maxim Uvarov)