[Xen-changelog] [xen-unstable] Merge with xenppc-unstable-merge.hg

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 0112511542d8a5e7cf6db01fe129b5eeeff06d93
# Parent  653588bfc0f983c75472e5725a922c2796984ee7
# Parent  b53b154a5126f55cccee374c71d33145cb1ef600
Merge with xenppc-unstable-merge.hg
---
 buildconfigs/Rules.mk          |    8 ++++++--
 patches/linux-2.6.16.13/series |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff -r 653588bfc0f9 -r 0112511542d8 buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk     Mon Aug 14 15:22:22 2006 -0500
+++ b/buildconfigs/Rules.mk     Tue Aug 15 10:30:19 2006 +0100
@@ -63,8 +63,12 @@ ref-%/.valid-ref: pristine-%/.valid-pris
        set -e
        rm -rf $(@D)
        cp -al $(<D) $(@D)
-       if [ -d patches/$* ] ; then \
-           for i in patches/$*/*.patch ; do patch -d $(@D) -p1 <$$i || exit 1 
; done ; \
+       if [ -d patches/$* ] ; then                                    \
+           echo Applying patches from patches/$*... ;                 \
+           for i in $$(cat patches/$*/series) ; do                    \
+               echo ... $$i ;                                         \
+               patch -d $(@D) -p1 --quiet <patches/$*/$$i || exit 1 ; \
+            done ;                                                    \
        fi
        touch $@ # update timestamp to avoid rebuild
 endif
diff -r 653588bfc0f9 -r 0112511542d8 patches/linux-2.6.16.13/series
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/linux-2.6.16.13/series    Tue Aug 15 10:30:19 2006 +0100
@@ -0,0 +1,20 @@
+blktap-aio-16_03_06.patch
+device_bind.patch
+fix-hz-suspend.patch
+fix-ide-cd-pio-mode.patch
+i386-mach-io-check-nmi.patch
+ipv6-no-autoconf.patch
+net-csum.patch
+net-gso-0-base.patch
+net-gso-1-check-dodgy.patch
+net-gso-2-checksum-fix.patch
+net-gso-3-fix-errorcheck.patch
+net-gso-4-kill-warnon.patch
+pmd-shared.patch
+rcu_needs_cpu.patch
+rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch
+smp-alts.patch
+tpm_plugin_2.6.17.patch
+x86-increase-interrupt-vector-range.patch
+xen-hotplug.patch
+xenoprof-generic.patch

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog