From: Sapan Bhatia Date: Fri, 10 Apr 2009 20:00:33 +0000 (+0000) Subject: Adding EGRE module for Trellis/VINI X-Git-Tag: linux-2.6-27-3~9 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a02240126b4ada434dc8f96f287ab8b2dc3c16c1;p=linux-2.6.git Adding EGRE module for Trellis/VINI --- diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 8175e013c..66544b011 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -169,6 +169,7 @@ Patch650: linux-2.6-650-hangcheck-reboot.patch Patch660: linux-2.6-660-nmi-watchdog-default.patch Patch680: linux-2.6-680-htb-hysteresis-tso.patch Patch690: linux-2.6-690-web100.patch +Patch700: linux-2.6-700-egre.patch BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -356,6 +357,7 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 640 %ApplyPatch 650 %ApplyPatch 660 +%ApplyPatch 700 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may diff --git a/linux-2.6-720-egre.patch b/linux-2.6-720-egre.patch new file mode 100644 index 000000000..e69de29bb