From: Maxim Uvarov Date: Sat, 31 Mar 2012 00:19:38 +0000 (-0700) Subject: SPEC: v2.6.39-200.0.11 X-Git-Tag: v2.6.39-400.9.0~426^2~37 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=73ecbaf2792fda2ed614a9462925ec6169b85077;p=users%2Fjedix%2Flinux-maple.git SPEC: v2.6.39-200.0.11 Signed-off-by: Maxim Uvarov --- diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec index a76cb2f976a3..b0170bde8d3b 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.10%{?dist}uek%{?buildid} +%define pkg_release %{distro_build}.0.11%{?dist}uek%{?buildid} %endif %define KVERREL %{rpmversion}-%{pkg_release} @@ -1680,6 +1680,12 @@ fi %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Fri Mar 30 2012 Maxim Uvarov [2.6.39-200.0.11.el5uek] +- vlan: allow nested vlan_do_receive() (Maxim Uvarov) +- net: allow vlan traffic to be received under bond (John Fastabend) +- net: vlan: goto another_round instead of calling __netif_receive_skb (Jiri + Pirko) + * Thu Mar 29 2012 Maxim Uvarov [2.6.39-200.0.10.el5uek] - ocfs2/cluster: Fix output in file elapsed_time_in_ms (Sunil Mushran) diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec index ab6eb38e8cc7..57c93fcd7980 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.10%{?dist}uek%{?buildid} +%define pkg_release %{distro_build}.0.11%{?dist}uek%{?buildid} %endif %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu} @@ -1692,6 +1692,12 @@ fi %kernel_variant_files -k vmlinux %{with_kdump} kdump %changelog +* Fri Mar 30 2012 Maxim Uvarov [2.6.39-200.0.11.el6uek] +- vlan: allow nested vlan_do_receive() (Maxim Uvarov) +- net: allow vlan traffic to be received under bond (John Fastabend) +- net: vlan: goto another_round instead of calling __netif_receive_skb (Jiri + Pirko) + * Thu Mar 29 2012 Maxim Uvarov [2.6.39-200.0.10.el6uek] - ocfs2/cluster: Fix output in file elapsed_time_in_ms (Sunil Mushran)