From 6f9729775139d4e86091e8d0fcff6bf489760793 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Thu, 24 Jun 2010 15:40:44 +0200 Subject: [PATCH] Revert "series.conf: make xenlinux patches conditional (+xenlinux)" This reverts commit 76f416f31823e059bbc995835e6978ac270fd0ae. --- series.conf | 212 ++++++++++++++++++++++++++-------------------------- 1 file changed, 106 insertions(+), 106 deletions(-) diff --git a/series.conf b/series.conf index 323b47f..2babcbf 100644 --- a/series.conf +++ b/series.conf @@ -690,109 +690,109 @@ # on top of them instead. This reduces workload when # re-basing to a newer xen tree. # -+xenlinux ### both uml framebuffer and xen need this one. -+xenlinux patches.xen/add-console-use-vt -+xenlinux -+xenlinux # split out patches -+xenlinux patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch -+xenlinux patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch -+xenlinux patches.xen/ipv6-no-autoconf -+xenlinux patches.xen/pci-guestdev -+xenlinux patches.xen/pci-reserve -+xenlinux patches.xen/tmem -+xenlinux -+xenlinux # bulk stuff, new files for xen -+xenlinux patches.xen/xen3-auto-xen-arch.diff -+xenlinux patches.xen/xen3-auto-xen-drivers.diff -+xenlinux patches.xen/xen3-auto-include-xen-interface.diff -+xenlinux -+xenlinux # kconfig bits for xen -+xenlinux patches.xen/xen3-auto-xen-kconfig.diff -+xenlinux -+xenlinux # common code changes -+xenlinux patches.xen/xen3-auto-common.diff -+xenlinux patches.xen/xen3-auto-arch-x86.diff -+xenlinux patches.xen/xen3-auto-arch-i386.diff -+xenlinux patches.xen/xen3-auto-arch-x86_64.diff -+xenlinux -+xenlinux # fixups due to upstream Xen parts -+xenlinux patches.xen/xen3-fixup-xen -+xenlinux -+xenlinux # newer changeset backports -+xenlinux -+xenlinux # changes outside arch/{i386,x86_64}/xen -+xenlinux patches.xen/xen3-fixup-kconfig -+xenlinux patches.xen/xen3-fixup-common -+xenlinux patches.xen/xen3-fixup-arch-x86 -+xenlinux -+xenlinux # ports of other patches -+xenlinux patches.xen/xen3-patch-2.6.18 -+xenlinux patches.xen/xen3-patch-2.6.19 -+xenlinux patches.xen/xen3-patch-2.6.20 -+xenlinux patches.xen/xen3-patch-2.6.21 -+xenlinux patches.xen/xen3-patch-2.6.22 -+xenlinux patches.xen/xen3-patch-2.6.23 -+xenlinux patches.xen/xen3-patch-2.6.24 -+xenlinux patches.xen/xen3-patch-2.6.25 -+xenlinux patches.xen/xen3-patch-2.6.26 -+xenlinux patches.xen/xen3-patch-2.6.27 -+xenlinux patches.xen/xen3-patch-2.6.28 -+xenlinux patches.xen/xen3-patch-2.6.29 -+xenlinux patches.xen/xen3-patch-2.6.30 -+xenlinux patches.xen/xen3-patch-2.6.31 -+xenlinux patches.xen/xen3-patch-2.6.32 -+xenlinux patches.xen/xen3-patch-2.6.33 -+xenlinux patches.xen/xen3-patch-2.6.34 -+xenlinux patches.xen/xen3-seccomp-disable-tsc-option -+xenlinux patches.xen/xen3-x86-mcp51-no-dac -+xenlinux patches.xen/xen3-x86-mark_rodata_rw.patch -+xenlinux patches.xen/xen3-acpi_processor_check_maxcpus.patch -+xenlinux patches.xen/xen3-kdb-x86 -+xenlinux patches.xen/xen3-stack-unwind -+xenlinux patches.xen/xen3-x86_64-unwind-annotations -+xenlinux # patches.xen/xen3-x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch -+xenlinux -+xenlinux # bugfixes and enhancements -+xenlinux patches.xen/xen-balloon-max-target -+xenlinux patches.xen/xen-modular-blktap -+xenlinux patches.xen/xen-blkback-bimodal-suse -+xenlinux patches.xen/xen-blkif-protocol-fallback-hack -+xenlinux patches.xen/xen-blkback-cdrom -+xenlinux patches.xen/xen-blktap-write-barriers -+xenlinux patches.xen/xen-op-packet -+xenlinux patches.xen/xen-blkfront-cdrom -+xenlinux patches.xen/xen-sections -+xenlinux patches.xen/xen-swiotlb-heuristics -+xenlinux patches.xen/xen-kconfig-compat -+xenlinux patches.xen/xen-cpufreq-report -+xenlinux patches.xen/xen-staging-build -+xenlinux patches.xen/xen-sysdev-suspend -+xenlinux patches.xen/xen-ipi-per-cpu-irq -+xenlinux patches.xen/xen-virq-per-cpu-irq -+xenlinux patches.xen/xen-clockevents -+xenlinux patches.xen/xen-no-reboot-vector -+xenlinux patches.xen/xen-spinlock-poll-early -+xenlinux patches.xen/xen-configurable-guest-devices -+xenlinux patches.xen/xen-netback-nr-irqs -+xenlinux patches.xen/xen-netback-notify-multi -+xenlinux patches.xen/xen-netback-generalize -+xenlinux patches.xen/xen-netback-multiple-tasklets -+xenlinux patches.xen/xen-netback-kernel-threads -+xenlinux patches.xen/xen-netfront-ethtool -+xenlinux patches.xen/xen-dcdbas -+xenlinux patches.xen/xen-floppy -+xenlinux patches.xen/xen-kzalloc -+xenlinux patches.xen/xen-unpriv-build -+xenlinux patches.xen/xen-x86-panic-no-reboot -+xenlinux patches.xen/xen-x86-dcr-fallback -+xenlinux patches.xen/xen-x86-consistent-nmi -+xenlinux patches.xen/xen-x86-no-lapic -+xenlinux patches.xen/xen-x86-pmd-handling -+xenlinux patches.xen/xen-x86-bigmem -+xenlinux patches.xen/xen-x86-machphys-prediction -+xenlinux patches.xen/xen-x86-exit-mmap -+xenlinux patches.xen/xen-x86-per-cpu-vcpu-info -+xenlinux patches.xen/xen-x86_64-pgd-pin -+xenlinux patches.xen/xen-x86_64-pgd-alloc-order -+xenlinux patches.xen/xen-x86_64-dump-user-pgt -+xenlinux patches.xen/xen-x86_64-note-init-p2m + ### both uml framebuffer and xen need this one. + patches.xen/add-console-use-vt + + # split out patches + patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch + patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch + patches.xen/ipv6-no-autoconf + patches.xen/pci-guestdev + patches.xen/pci-reserve + patches.xen/tmem + + # bulk stuff, new files for xen + patches.xen/xen3-auto-xen-arch.diff + patches.xen/xen3-auto-xen-drivers.diff + patches.xen/xen3-auto-include-xen-interface.diff + + # kconfig bits for xen + patches.xen/xen3-auto-xen-kconfig.diff + + # common code changes + patches.xen/xen3-auto-common.diff + patches.xen/xen3-auto-arch-x86.diff + patches.xen/xen3-auto-arch-i386.diff + patches.xen/xen3-auto-arch-x86_64.diff + + # fixups due to upstream Xen parts + patches.xen/xen3-fixup-xen + + # newer changeset backports + + # changes outside arch/{i386,x86_64}/xen + patches.xen/xen3-fixup-kconfig + patches.xen/xen3-fixup-common + patches.xen/xen3-fixup-arch-x86 + + # ports of other patches + patches.xen/xen3-patch-2.6.18 + patches.xen/xen3-patch-2.6.19 + patches.xen/xen3-patch-2.6.20 + patches.xen/xen3-patch-2.6.21 + patches.xen/xen3-patch-2.6.22 + patches.xen/xen3-patch-2.6.23 + patches.xen/xen3-patch-2.6.24 + patches.xen/xen3-patch-2.6.25 + patches.xen/xen3-patch-2.6.26 + patches.xen/xen3-patch-2.6.27 + patches.xen/xen3-patch-2.6.28 + patches.xen/xen3-patch-2.6.29 + patches.xen/xen3-patch-2.6.30 + patches.xen/xen3-patch-2.6.31 + patches.xen/xen3-patch-2.6.32 + patches.xen/xen3-patch-2.6.33 + patches.xen/xen3-patch-2.6.34 + patches.xen/xen3-seccomp-disable-tsc-option + patches.xen/xen3-x86-mcp51-no-dac + patches.xen/xen3-x86-mark_rodata_rw.patch + patches.xen/xen3-acpi_processor_check_maxcpus.patch + patches.xen/xen3-kdb-x86 + patches.xen/xen3-stack-unwind + patches.xen/xen3-x86_64-unwind-annotations +# patches.xen/xen3-x86_cpufreq_make_trace_power_frequency_cpufreq_driver_independent.patch + + # bugfixes and enhancements + patches.xen/xen-balloon-max-target + patches.xen/xen-modular-blktap + patches.xen/xen-blkback-bimodal-suse + patches.xen/xen-blkif-protocol-fallback-hack + patches.xen/xen-blkback-cdrom + patches.xen/xen-blktap-write-barriers + patches.xen/xen-op-packet + patches.xen/xen-blkfront-cdrom + patches.xen/xen-sections + patches.xen/xen-swiotlb-heuristics + patches.xen/xen-kconfig-compat + patches.xen/xen-cpufreq-report + patches.xen/xen-staging-build + patches.xen/xen-sysdev-suspend + patches.xen/xen-ipi-per-cpu-irq + patches.xen/xen-virq-per-cpu-irq + patches.xen/xen-clockevents + patches.xen/xen-no-reboot-vector + patches.xen/xen-spinlock-poll-early + patches.xen/xen-configurable-guest-devices + patches.xen/xen-netback-nr-irqs + patches.xen/xen-netback-notify-multi + patches.xen/xen-netback-generalize + patches.xen/xen-netback-multiple-tasklets + patches.xen/xen-netback-kernel-threads + patches.xen/xen-netfront-ethtool + patches.xen/xen-dcdbas + patches.xen/xen-floppy + patches.xen/xen-kzalloc + patches.xen/xen-unpriv-build + patches.xen/xen-x86-panic-no-reboot + patches.xen/xen-x86-dcr-fallback + patches.xen/xen-x86-consistent-nmi + patches.xen/xen-x86-no-lapic + patches.xen/xen-x86-pmd-handling + patches.xen/xen-x86-bigmem + patches.xen/xen-x86-machphys-prediction + patches.xen/xen-x86-exit-mmap + patches.xen/xen-x86-per-cpu-vcpu-info + patches.xen/xen-x86_64-pgd-pin + patches.xen/xen-x86_64-pgd-alloc-order + patches.xen/xen-x86_64-dump-user-pgt + patches.xen/xen-x86_64-note-init-p2m