rpms/kernel/devel kernel-2.6.spec, 1.2263, 1.2264 linux-2.6-xen.patch, 1.23, 1.24
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jun 10 01:33:43 UTC 2006
Author: quintela
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17908
Modified Files:
kernel-2.6.spec linux-2.6-xen.patch
Log Message:
rebase linux-2.6-xen patch
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2263
retrieving revision 1.2264
diff -u -r1.2263 -r1.2264
--- kernel-2.6.spec 10 Jun 2006 01:29:42 -0000 1.2263
+++ kernel-2.6.spec 10 Jun 2006 01:32:58 -0000 1.2264
@@ -1815,6 +1815,8 @@
%changelog
* Sat Jun 10 2006 Juan Quintela <quintela at redhat.com>
+- rebase xen to linux-2.6 cset 27412
+- rebase xen to linux-2.6-xen cset 22608
- rebase HV cset 10314
* Fri Jun 9 2006 David Woodhouse <dwmw2 at redhat.com>
linux-2.6-xen.patch:
arch/i386/Kconfig | 92
arch/i386/Kconfig.cpu | 2
arch/i386/Kconfig.debug | 1
arch/i386/Makefile | 24
arch/i386/boot-xen/Makefile | 21
arch/i386/kernel/Makefile | 22
arch/i386/kernel/acpi/Makefile | 4
arch/i386/kernel/acpi/boot-xen.c | 1167 ++++++++
arch/i386/kernel/apic-xen.c | 160 +
arch/i386/kernel/asm-offsets.c | 10
arch/i386/kernel/cpu/Makefile | 5
arch/i386/kernel/cpu/common-xen.c | 732 +++++
arch/i386/kernel/cpu/mtrr/Makefile | 7
arch/i386/kernel/cpu/mtrr/main-xen.c | 197 +
arch/i386/kernel/early_printk-xen.c | 2
arch/i386/kernel/entry-xen.S | 903 ++++++
arch/i386/kernel/entry.S | 10
arch/i386/kernel/fixup.c | 86
arch/i386/kernel/head-xen.S | 181 +
arch/i386/kernel/init_task-xen.c | 51
arch/i386/kernel/io_apic-xen.c | 2751 ++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 121
arch/i386/kernel/irq-xen.c | 306 ++
arch/i386/kernel/irq.c | 4
arch/i386/kernel/ldt-xen.c | 269 +
arch/i386/kernel/microcode-xen.c | 148 +
arch/i386/kernel/mpparse-xen.c | 1186 ++++++++
arch/i386/kernel/pci-dma-xen.c | 344 ++
arch/i386/kernel/process-xen.c | 812 +++++
arch/i386/kernel/quirks-xen.c | 48
arch/i386/kernel/setup-xen.c | 1795 +++++++++++++
arch/i386/kernel/smp-xen.c | 613 ++++
arch/i386/kernel/swiotlb.c | 665 ++++
arch/i386/kernel/sysenter.c | 102
arch/i386/kernel/time-xen.c | 1103 ++++++++
arch/i386/kernel/traps-xen.c | 1136 ++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/vm86.c | 12
arch/i386/kernel/vsyscall-note-xen.S | 32
arch/i386/mach-xen/Makefile | 5
arch/i386/mach-xen/setup.c | 49
arch/i386/mm/Makefile | 8
arch/i386/mm/fault-xen.c | 683 ++++
arch/i386/mm/highmem-xen.c | 123
arch/i386/mm/hypervisor.c | 414 +++
arch/i386/mm/init-xen.c | 850 ++++++
arch/i386/mm/ioremap-xen.c | 476 +++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 642 ++++
arch/i386/mm/pgtable.c | 12
arch/i386/oprofile/Makefile | 4
arch/i386/oprofile/xenoprof.c | 432 +++
arch/i386/pci/Makefile | 9
arch/i386/pci/irq-xen.c | 1204 ++++++++
arch/i386/pci/pcifront.c | 55
arch/i386/power/Makefile | 4
arch/ia64/Kconfig | 65
arch/ia64/Makefile | 18
arch/ia64/hp/sim/Makefile | 2
arch/ia64/kernel/entry.S | 32
arch/ia64/kernel/head.S | 6
arch/ia64/kernel/iosapic.c | 68
arch/ia64/kernel/irq_ia64.c | 200 +
arch/ia64/kernel/pal.S | 5
arch/ia64/kernel/setup.c | 54
arch/ia64/mm/ioremap.c | 3
arch/ia64/xen/Makefile | 8
arch/ia64/xen/drivers/README | 2
arch/ia64/xen/drivers/patches/blkback.c.patch | 33
arch/ia64/xen/drivers/patches/console.c.patch | 11
arch/ia64/xen/drivers/patches/devmem.c.patch | 2
arch/ia64/xen/drivers/patches/gnttab.c.patch | 33
arch/ia64/xen/drivers/patches/privcmd.c.patch | 30
arch/ia64/xen/drivers/xenia64_init.c | 60
arch/ia64/xen/hypercall.S | 353 ++
arch/ia64/xen/hypervisor.c | 761 +++++
arch/ia64/xen/util.c | 115
arch/ia64/xen/xenentry.S | 883 ++++++
arch/ia64/xen/xenhpski.c | 19
arch/ia64/xen/xenivt.S | 2171 +++++++++++++++
arch/ia64/xen/xenminstate.h | 369 ++
arch/ia64/xen/xenpal.S | 76
arch/ia64/xen/xensetup.S | 24
arch/um/kernel/physmem.c | 4
arch/x86_64/Kconfig | 60
arch/x86_64/Makefile | 20
arch/x86_64/ia32/Makefile | 20
arch/x86_64/ia32/ia32entry-xen.S | 726 +++++
arch/x86_64/ia32/syscall32-xen.c | 128
arch/x86_64/ia32/syscall32_syscall-xen.S | 28
arch/x86_64/ia32/vsyscall-int80.S | 58
arch/x86_64/ia32/vsyscall-sigreturn.S | 2
arch/x86_64/kernel/Makefile | 19
arch/x86_64/kernel/acpi/Makefile | 1
arch/x86_64/kernel/apic-xen.c | 198 +
arch/x86_64/kernel/asm-offsets.c | 2
arch/x86_64/kernel/e820-xen.c | 757 +++++
arch/x86_64/kernel/early_printk-xen.c | 304 ++
arch/x86_64/kernel/entry-xen.S | 1141 ++++++++
arch/x86_64/kernel/entry.S | 2
arch/x86_64/kernel/genapic-xen.c | 144 +
arch/x86_64/kernel/genapic_xen.c | 162 +
arch/x86_64/kernel/head-xen.S | 176 +
arch/x86_64/kernel/head64-xen.c | 140 +
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2232 ++++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 57
arch/x86_64/kernel/irq-xen.c | 163 +
arch/x86_64/kernel/irq.c | 4
arch/x86_64/kernel/ldt-xen.c | 282 ++
arch/x86_64/kernel/mpparse-xen.c | 1012 +++++++
arch/x86_64/kernel/pci-swiotlb-xen.c | 54
arch/x86_64/kernel/process-xen.c | 791 +++++
arch/x86_64/kernel/setup-xen.c | 1725 ++++++++++++
arch/x86_64/kernel/setup64-xen.c | 360 ++
arch/x86_64/kernel/smp-xen.c | 596 ++++
arch/x86_64/kernel/smp.c | 4
arch/x86_64/kernel/traps-xen.c | 1035 +++++++
arch/x86_64/kernel/vsyscall-xen.c | 239 +
arch/x86_64/kernel/x8664_ksyms-xen.c | 155 +
arch/x86_64/kernel/xen_entry.S | 40
arch/x86_64/mm/Makefile | 10
arch/x86_64/mm/fault-xen.c | 644 ++++
arch/x86_64/mm/init-xen.c | 1179 ++++++++
arch/x86_64/mm/pageattr-xen.c | 390 ++
arch/x86_64/oprofile/Makefile | 5
arch/x86_64/pci/Makefile | 12
drivers/Makefile | 1
drivers/acpi/Kconfig | 3
drivers/char/mem.c | 6
drivers/char/tpm/Kconfig | 14
drivers/char/tpm/Makefile | 2
drivers/char/tpm/tpm.c | 44
drivers/char/tpm/tpm.h | 7
drivers/char/tpm/tpm_vtpm.c | 546 +++
drivers/char/tpm/tpm_vtpm.h | 38
drivers/char/tpm/tpm_xen.c | 756 +++++
drivers/char/tty_io.c | 7
drivers/firmware/Kconfig | 2
drivers/ide/ide-lib.c | 8
drivers/oprofile/buffer_sync.c | 39
drivers/oprofile/cpu_buffer.c | 26
drivers/oprofile/cpu_buffer.h | 8
drivers/oprofile/event_buffer.h | 3
drivers/oprofile/oprof.c | 19
drivers/oprofile/oprof.h | 2
drivers/oprofile/oprofile_files.c | 82
drivers/pci/Kconfig | 1
drivers/serial/Kconfig | 1
drivers/video/Kconfig | 2
drivers/xen/Kconfig | 257 +
drivers/xen/Makefile | 17
drivers/xen/balloon/Makefile | 2
drivers/xen/balloon/balloon.c | 605 ++++
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 580 ++++
drivers/xen/blkback/common.h | 136
drivers/xen/blkback/interface.c | 165 +
drivers/xen/blkback/vbd.c | 119
drivers/xen/blkback/xenbus.c | 410 ++
drivers/xen/blkfront/Kconfig | 6
drivers/xen/blkfront/Makefile | 5
drivers/xen/blkfront/blkfront.c | 822 +++++
drivers/xen/blkfront/block.h | 156 +
drivers/xen/blkfront/vbd.c | 318 ++
drivers/xen/blktap/Makefile | 3
drivers/xen/blktap/blktap.c | 900 ++++++
drivers/xen/blktap/common.h | 100
drivers/xen/blktap/interface.c | 134
drivers/xen/blktap/xenbus.c | 223 +
drivers/xen/char/Makefile | 2
drivers/xen/char/mem.c | 182 +
drivers/xen/console/Makefile | 2
drivers/xen/console/console.c | 640 ++++
drivers/xen/console/xencons_ring.c | 141 +
drivers/xen/core/Makefile | 14
drivers/xen/core/cpu_hotplug.c | 185 +
drivers/xen/core/evtchn.c | 855 ++++++
drivers/xen/core/features.c | 30
drivers/xen/core/gnttab.c | 460 +++
drivers/xen/core/hypervisor_sysfs.c | 60
drivers/xen/core/reboot.c | 364 ++
drivers/xen/core/skbuff.c | 134
drivers/xen/core/smpboot.c | 433 +++
drivers/xen/core/xen_proc.c | 19
drivers/xen/core/xen_sysfs.c | 316 ++
drivers/xen/evtchn/Makefile | 2
drivers/xen/evtchn/evtchn.c | 458 +++
drivers/xen/netback/Makefile | 5
drivers/xen/netback/common.h | 123
drivers/xen/netback/interface.c | 314 ++
drivers/xen/netback/loopback.c | 255 +
drivers/xen/netback/netback.c | 1039 +++++++
drivers/xen/netback/xenbus.c | 396 ++
drivers/xen/netfront/Kconfig | 6
drivers/xen/netfront/Makefile | 4
drivers/xen/netfront/netfront.c | 1597 +++++++++++
drivers/xen/pciback/Makefile | 13
drivers/xen/pciback/conf_space.c | 403 ++
drivers/xen/pciback/conf_space.h | 123
drivers/xen/pciback/conf_space_capability.c | 71
drivers/xen/pciback/conf_space_capability.h | 23
drivers/xen/pciback/conf_space_capability_pm.c | 113
drivers/xen/pciback/conf_space_capability_vpd.c | 42
drivers/xen/pciback/conf_space_header.c | 299 ++
drivers/xen/pciback/passthrough.c | 157 +
drivers/xen/pciback/pci_stub.c | 690 +++++
drivers/xen/pciback/pciback.h | 91
drivers/xen/pciback/pciback_ops.c | 95
drivers/xen/pciback/vpci.c | 204 +
drivers/xen/pciback/xenbus.c | 454 +++
drivers/xen/pcifront/Makefile | 7
drivers/xen/pcifront/pci.c | 46
drivers/xen/pcifront/pci_op.c | 272 +
drivers/xen/pcifront/pcifront.h | 40
drivers/xen/pcifront/xenbus.c | 294 ++
drivers/xen/privcmd/Makefile | 2
drivers/xen/privcmd/privcmd.c | 285 ++
drivers/xen/tpmback/Makefile | 4
drivers/xen/tpmback/common.h | 82
drivers/xen/tpmback/interface.c | 177 +
drivers/xen/tpmback/tpmback.c | 1074 +++++++
drivers/xen/tpmback/xenbus.c | 306 ++
drivers/xen/util.c | 70
drivers/xen/xenbus/Makefile | 12
drivers/xen/xenbus/xenbus_backend_client.c | 135
drivers/xen/xenbus/xenbus_client.c | 281 ++
drivers/xen/xenbus/xenbus_comms.c | 208 +
drivers/xen/xenbus/xenbus_comms.h | 43
drivers/xen/xenbus/xenbus_dev.c | 245 +
drivers/xen/xenbus/xenbus_probe.c | 1083 +++++++
drivers/xen/xenbus/xenbus_xs.c | 846 ++++++
fs/Kconfig | 1
include/asm-i386/a.out.h | 2
include/asm-i386/apic.h | 2
include/asm-i386/elf.h | 7
include/asm-i386/fixmap.h | 13
include/asm-i386/mach-default/mach_traps.h | 12
include/asm-i386/mach-xen/asm/agp.h | 37
include/asm-i386/mach-xen/asm/desc.h | 164 +
include/asm-i386/mach-xen/asm/dma-mapping.h | 154 +
include/asm-i386/mach-xen/asm/fixmap.h | 156 +
include/asm-i386/mach-xen/asm/floppy.h | 147 +
include/asm-i386/mach-xen/asm/highmem.h | 81
include/asm-i386/mach-xen/asm/hw_irq.h | 73
include/asm-i386/mach-xen/asm/hypercall.h | 370 ++
include/asm-i386/mach-xen/asm/hypervisor.h | 226 +
include/asm-i386/mach-xen/asm/io.h | 390 ++
include/asm-i386/mach-xen/asm/kmap_types.h | 32
include/asm-i386/mach-xen/asm/mmu.h | 21
include/asm-i386/mach-xen/asm/mmu_context.h | 105
include/asm-i386/mach-xen/asm/page.h | 327 ++
include/asm-i386/mach-xen/asm/param.h | 24
include/asm-i386/mach-xen/asm/pci.h | 154 +
include/asm-i386/mach-xen/asm/pgalloc.h | 64
include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21
include/asm-i386/mach-xen/asm/pgtable-2level.h | 88
include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
include/asm-i386/mach-xen/asm/pgtable-3level.h | 203 +
include/asm-i386/mach-xen/asm/pgtable.h | 509 +++
include/asm-i386/mach-xen/asm/processor.h | 753 +++++
include/asm-i386/mach-xen/asm/ptrace.h | 90
include/asm-i386/mach-xen/asm/scatterlist.h | 22
include/asm-i386/mach-xen/asm/segment.h | 117
include/asm-i386/mach-xen/asm/setup.h | 64
include/asm-i386/mach-xen/asm/smp.h | 104
include/asm-i386/mach-xen/asm/spinlock.h | 200 +
include/asm-i386/mach-xen/asm/swiotlb.h | 43
include/asm-i386/mach-xen/asm/synch_bitops.h | 141 +
include/asm-i386/mach-xen/asm/system.h | 578 ++++
include/asm-i386/mach-xen/asm/tlbflush.h | 102
include/asm-i386/mach-xen/asm/vga.h | 20
include/asm-i386/mach-xen/irq_vectors.h | 125
include/asm-i386/mach-xen/mach_traps.h | 33
include/asm-i386/mach-xen/setup_arch_post.h | 84
include/asm-i386/mach-xen/setup_arch_pre.h | 5
include/asm-i386/page.h | 4
include/asm-i386/pgtable-2level-defs.h | 2
include/asm-i386/pgtable-3level-defs.h | 2
include/asm-ia64/agp.h | 31
include/asm-ia64/dma-mapping.h | 71
include/asm-ia64/fixmap.h | 2
include/asm-ia64/gcc_intrin.h | 60
include/asm-ia64/hw_irq.h | 8
include/asm-ia64/hypercall.h | 533 +++
include/asm-ia64/hypervisor.h | 198 +
include/asm-ia64/intel_intrin.h | 68
include/asm-ia64/io.h | 52
include/asm-ia64/iosapic.h | 2
include/asm-ia64/irq.h | 31
include/asm-ia64/machvec.h | 15
include/asm-ia64/meminit.h | 5
include/asm-ia64/page.h | 112
include/asm-ia64/pal.h | 1
include/asm-ia64/pgalloc.h | 2
include/asm-ia64/privop.h | 60
include/asm-ia64/processor.h | 1
include/asm-ia64/synch_bitops.h | 61
include/asm-ia64/system.h | 4
include/asm-ia64/xen/privop.h | 280 ++
include/asm-um/page.h | 2
include/asm-x86_64/apic.h | 2
include/asm-x86_64/hw_irq.h | 2
include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27
include/asm-x86_64/mach-xen/asm/bootsetup.h | 42
include/asm-x86_64/mach-xen/asm/desc.h | 263 +
include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 +
include/asm-x86_64/mach-xen/asm/dmi.h | 29
include/asm-x86_64/mach-xen/asm/e820.h | 63
include/asm-x86_64/mach-xen/asm/fixmap.h | 114
include/asm-x86_64/mach-xen/asm/floppy.h | 206 +
include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 +
include/asm-x86_64/mach-xen/asm/hypercall.h | 370 ++
include/asm-x86_64/mach-xen/asm/hypervisor.h | 2
include/asm-x86_64/mach-xen/asm/io.h | 328 ++
include/asm-x86_64/mach-xen/asm/irq.h | 39
include/asm-x86_64/mach-xen/asm/mmu.h | 33
include/asm-x86_64/mach-xen/asm/mmu_context.h | 134
include/asm-x86_64/mach-xen/asm/msr.h | 399 ++
include/asm-x86_64/mach-xen/asm/nmi.h | 75
include/asm-x86_64/mach-xen/asm/page.h | 319 ++
include/asm-x86_64/mach-xen/asm/param.h | 23
include/asm-x86_64/mach-xen/asm/pci.h | 174 +
include/asm-x86_64/mach-xen/asm/pgalloc.h | 226 +
include/asm-x86_64/mach-xen/asm/pgtable.h | 564 ++++
include/asm-x86_64/mach-xen/asm/processor.h | 494 +++
include/asm-x86_64/mach-xen/asm/ptrace.h | 125
include/asm-x86_64/mach-xen/asm/smp.h | 153 +
include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
include/asm-x86_64/mach-xen/asm/system.h | 428 +++
include/asm-x86_64/mach-xen/asm/timer.h | 67
include/asm-x86_64/mach-xen/asm/tlbflush.h | 104
include/asm-x86_64/mach-xen/asm/vga.h | 20
include/asm-x86_64/mach-xen/asm/xor.h | 328 ++
include/asm-x86_64/mach-xen/irq_vectors.h | 123
include/asm-x86_64/mach-xen/mach_time.h | 111
include/asm-x86_64/mach-xen/mach_timer.h | 48
include/asm-x86_64/mach-xen/setup_arch_post.h | 58
include/asm-x86_64/mach-xen/setup_arch_pre.h | 5
include/linux/gfp.h | 6
include/linux/highmem.h | 6
include/linux/mm.h | 10
include/linux/oprofile.h | 8
include/linux/pfn.h | 2
include/linux/skbuff.h | 13
include/xen/balloon.h | 63
include/xen/cpu_hotplug.h | 44
include/xen/driver_util.h | 16
include/xen/evtchn.h | 114
include/xen/features.h | 20
include/xen/foreign_page.h | 30
include/xen/gnttab.h | 150 +
include/xen/hypervisor_sysfs.h | 32
include/xen/interface/acm.h | 187 +
include/xen/interface/acm_ops.h | 102
include/xen/interface/arch-ia64.h | 418 +++
include/xen/interface/arch-x86_32.h | 224 +
include/xen/interface/arch-x86_64.h | 293 ++
include/xen/interface/callback.h | 74
include/xen/interface/dom0_ops.h | 574 ++++
include/xen/interface/event_channel.h | 233 +
include/xen/interface/features.h | 53
include/xen/interface/grant_table.h | 317 ++
include/xen/interface/hvm/hvm_info_table.h | 24
include/xen/interface/hvm/ioreq.h | 98
include/xen/interface/hvm/vmx_assist.h | 98
include/xen/interface/io/blkif.h | 87
include/xen/interface/io/console.h | 33
include/xen/interface/io/netif.h | 92
include/xen/interface/io/pciif.h | 55
include/xen/interface/io/ring.h | 273 +
include/xen/interface/io/tpmif.h | 59
include/xen/interface/io/xenbus.h | 45
include/xen/interface/io/xs_wire.h | 97
include/xen/interface/memory.h | 187 +
include/xen/interface/nmi.h | 60
include/xen/interface/physdev.h | 144 +
include/xen/interface/sched.h | 103
include/xen/interface/sched_ctl.h | 69
include/xen/interface/trace.h | 86
include/xen/interface/vcpu.h | 121
include/xen/interface/version.h | 67
include/xen/interface/xen-compat.h | 47
include/xen/interface/xen.h | 505 +++
include/xen/interface/xenoprof.h | 94
include/xen/pcifront.h | 39
include/xen/public/evtchn.h | 91
include/xen/public/privcmd.h | 79
include/xen/xen_proc.h | 13
include/xen/xenbus.h | 296 ++
include/xen/xencons.h | 14
kernel/Kconfig.preempt | 1
kernel/irq/manage.c | 26
lib/Makefile | 3
mm/Kconfig | 3
mm/highmem.c | 11
mm/memory.c | 121
mm/mmap.c | 4
mm/page_alloc.c | 6
net/core/dev.c | 63
net/core/skbuff.c | 41
net/ipv4/netfilter/ip_nat_proto_tcp.c | 9
net/ipv4/netfilter/ip_nat_proto_udp.c | 12
net/ipv4/xfrm4_output.c | 6
scripts/Makefile.xen | 14
405 files changed, 82852 insertions(+), 257 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.23 -r 1.24 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linux-2.6-xen.patch 2 Jun 2006 15:45:53 -0000 1.23
+++ linux-2.6-xen.patch 10 Jun 2006 01:32:58 -0000 1.24
@@ -1,4 +1,4 @@
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile merge/arch/i386/boot-xen/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile merge/arch/i386/boot-xen/Makefile
--- ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/boot-xen/Makefile 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,21 @@
@@ -23,7 +23,7 @@
+ install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+ install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
+ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/Kconfig merge/arch/i386/Kconfig
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig merge/arch/i386/Kconfig
--- ../upstream/hg/linux-2.6/arch/i386/Kconfig 2006-05-27 02:37:47.000000000 +0200
+++ merge/arch/i386/Kconfig 2006-05-30 12:42:43.000000000 +0200
@@ -91,6 +91,15 @@ config X86_PC
@@ -315,7 +315,7 @@
config KTIME_SCALAR
bool
default y
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu merge/arch/i386/Kconfig.cpu
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu merge/arch/i386/Kconfig.cpu
--- ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu 2006-04-14 19:01:33.000000000 +0200
+++ merge/arch/i386/Kconfig.cpu 2006-05-30 12:42:43.000000000 +0200
@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
@@ -327,7 +327,7 @@
default y
config X86_WP_WORKS_OK
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug merge/arch/i386/Kconfig.debug
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug merge/arch/i386/Kconfig.debug
--- ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug 2006-04-20 13:58:44.000000000 +0200
+++ merge/arch/i386/Kconfig.debug 2006-05-30 12:42:43.000000000 +0200
@@ -84,6 +84,7 @@ config X86_MPPARSE
@@ -338,7 +338,7 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c merge/arch/i386/kernel/acpi/boot-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c merge/arch/i386/kernel/acpi/boot-xen.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/acpi/boot-xen.c 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,1167 @@
@@ -1509,7 +1509,7 @@
+
+ return 0;
+}
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile merge/arch/i386/kernel/acpi/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile merge/arch/i386/kernel/acpi/Makefile
--- ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile 2006-03-10 14:25:05.000000000 +0100
+++ merge/arch/i386/kernel/acpi/Makefile 2006-05-30 12:42:43.000000000 +0200
@@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
@@ -1520,7 +1520,7 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c merge/arch/i386/kernel/apic-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c merge/arch/i386/kernel/apic-xen.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/apic-xen.c 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,160 @@
@@ -1684,7 +1684,7 @@
+
+ return 0;
+}
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c merge/arch/i386/kernel/asm-offsets.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c merge/arch/i386/kernel/asm-offsets.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c 2005-11-07 20:02:43.000000000 +0100
+++ merge/arch/i386/kernel/asm-offsets.c 2006-05-30 12:42:43.000000000 +0200
@@ -13,6 +13,7 @@
@@ -1713,7 +1713,7 @@
- DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
+ DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
}
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c merge/arch/i386/kernel/cpu/common-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c merge/arch/i386/kernel/cpu/common-xen.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/cpu/common-xen.c 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,732 @@
@@ -2449,7 +2449,7 @@
+ per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
+}
+#endif
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile merge/arch/i386/kernel/cpu/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile merge/arch/i386/kernel/cpu/Makefile
--- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile 2005-11-07 20:02:43.000000000 +0100
+++ merge/arch/i386/kernel/cpu/Makefile 2006-05-30 12:42:43.000000000 +0200
@@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/
@@ -2461,7 +2461,7 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c merge/arch/i386/kernel/cpu/mtrr/main-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c merge/arch/i386/kernel/cpu/mtrr/main-xen.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,197 @@
@@ -2662,7 +2662,7 @@
+}
+
+subsys_initcall(mtrr_init);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile merge/arch/i386/kernel/cpu/mtrr/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile merge/arch/i386/kernel/cpu/mtrr/Makefile
--- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile 2005-11-07 20:02:43.000000000 +0100
+++ merge/arch/i386/kernel/cpu/mtrr/Makefile 2006-05-30 12:42:43.000000000 +0200
@@ -3,3 +3,10 @@ obj-y += amd.o
@@ -2676,13 +2676,13 @@
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c merge/arch/i386/kernel/early_printk-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c merge/arch/i386/kernel/early_printk-xen.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/early_printk-xen.c 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,2 @@
+
+#include "../../x86_64/kernel/early_printk-xen.c"
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S merge/arch/i386/kernel/entry.S
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S merge/arch/i386/kernel/entry.S
--- ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S 2006-04-04 08:17:22.000000000 +0200
+++ merge/arch/i386/kernel/entry.S 2006-05-30 12:42:43.000000000 +0200
@@ -177,7 +177,7 @@ need_resched:
@@ -2730,7 +2730,7 @@
pushfl; \
pushl $__KERNEL_CS; \
pushl $sysenter_past_esp
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S merge/arch/i386/kernel/entry-xen.S
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S merge/arch/i386/kernel/entry-xen.S
--- ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/entry-xen.S 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,903 @@
@@ -3637,7 +3637,7 @@
+#include "syscall_table.S"
+
+syscall_table_size=(.-sys_call_table)
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/fixup.c merge/arch/i386/kernel/fixup.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/fixup.c merge/arch/i386/kernel/fixup.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/fixup.c 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/fixup.c 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,86 @@
@@ -3727,9 +3727,9 @@
+ return 0;
+}
+__initcall(fixup_init);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/head-xen.S merge/arch/i386/kernel/head-xen.S
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/head-xen.S merge/arch/i386/kernel/head-xen.S
--- ../upstream/hg/linux-2.6/arch/i386/kernel/head-xen.S 1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/head-xen.S 2006-05-30 12:42:43.000000000 +0200
++++ merge/arch/i386/kernel/head-xen.S 2006-06-05 16:00:51.000000000 +0200
@@ -0,0 +1,181 @@
+
+
@@ -3906,13 +3906,13 @@
+ .ascii "|pae_pgdir_above_4gb"
+ .ascii "|supervisor_mode_kernel"
+#ifdef CONFIG_X86_PAE
-+ .ascii ",PAE=yes"
++ .ascii ",PAE=yes[extended-cr3]"
+#else
+ .ascii ",PAE=no"
+#endif
+ .ascii ",LOADER=generic"
+ .byte 0
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/init_task-xen.c merge/arch/i386/kernel/init_task-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/init_task-xen.c merge/arch/i386/kernel/init_task-xen.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/init_task-xen.c 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/init_task-xen.c 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,51 @@
@@ -3967,7 +3967,7 @@
+DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_internodealigned_in_smp = INIT_TSS;
+#endif
+
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/io_apic-xen.c merge/arch/i386/kernel/io_apic-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/io_apic-xen.c merge/arch/i386/kernel/io_apic-xen.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/io_apic-xen.c 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/io_apic-xen.c 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,2751 @@
@@ -6722,7 +6722,7 @@
+}
+
+#endif /* CONFIG_ACPI */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/ioport-xen.c merge/arch/i386/kernel/ioport-xen.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/ioport-xen.c merge/arch/i386/kernel/ioport-xen.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/ioport-xen.c 1970-01-01 01:00:00.000000000 +0100
+++ merge/arch/i386/kernel/ioport-xen.c 2006-05-30 12:42:43.000000000 +0200
@@ -0,0 +1,121 @@
@@ -6847,7 +6847,7 @@
+ set_iopl_mask(t->iopl);
+ return 0;
+}
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/arch/i386/kernel/irq.c merge/arch/i386/kernel/irq.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/irq.c merge/arch/i386/kernel/irq.c
--- ../upstream/hg/linux-2.6/arch/i386/kernel/irq.c 2006-01-09 15:53:47.000000000 +0100
[...6806 lines suppressed...]
--- ../upstream/hg/linux-2.6/include/xen/public/privcmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ merge/include/xen/public/privcmd.h 2006-05-30 12:44:01.000000000 +0200
-@@ -0,0 +1,77 @@
++++ merge/include/xen/public/privcmd.h 2006-06-07 13:30:42.000000000 +0200
+@@ -0,0 +1,79 @@
+/******************************************************************************
+ * privcmd.h
+ *
@@ -85254,20 +85893,22 @@
+#ifndef __LINUX_PUBLIC_PRIVCMD_H__
+#define __LINUX_PUBLIC_PRIVCMD_H__
+
++#include <linux/types.h>
++
+#ifndef __user
+#define __user
+#endif
+
+typedef struct privcmd_hypercall
+{
-+ unsigned long op;
-+ unsigned long arg[5];
++ __u64 op;
++ __u64 arg[5];
+} privcmd_hypercall_t;
+
+typedef struct privcmd_mmap_entry {
-+ unsigned long va;
-+ unsigned long mfn;
-+ unsigned long npages;
++ __u64 va;
++ __u64 mfn;
++ __u64 npages;
+} privcmd_mmap_entry_t;
+
+typedef struct privcmd_mmap {
@@ -85279,8 +85920,8 @@
+typedef struct privcmd_mmapbatch {
+ int num; /* number of pages to populate */
+ domid_t dom; /* target domain */
-+ unsigned long addr; /* virtual address */
-+ unsigned long __user *arr; /* array of mfns - top nibble set on err */
++ __u64 addr; /* virtual address */
++ xen_pfn_t __user *arr; /* array of mfns - top nibble set on err */
+} privcmd_mmapbatch_t;
+
+/*
@@ -85296,7 +85937,7 @@
+ _IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t))
+
+#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/include/xen/xenbus.h merge/include/xen/xenbus.h
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/xen/xenbus.h merge/include/xen/xenbus.h
--- ../upstream/hg/linux-2.6/include/xen/xenbus.h 1970-01-01 01:00:00.000000000 +0100
+++ merge/include/xen/xenbus.h 2006-05-30 12:46:38.000000000 +0200
@@ -0,0 +1,296 @@
@@ -85596,7 +86237,7 @@
+
+
+#endif /* _XEN_XENBUS_H */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/include/xen/xencons.h merge/include/xen/xencons.h
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/xen/xencons.h merge/include/xen/xencons.h
--- ../upstream/hg/linux-2.6/include/xen/xencons.h 1970-01-01 01:00:00.000000000 +0100
+++ merge/include/xen/xencons.h 2006-05-30 12:44:01.000000000 +0200
@@ -0,0 +1,14 @@
@@ -85614,7 +86255,7 @@
+int xencons_ring_send(const char *data, unsigned len);
+
+#endif /* __ASM_XENCONS_H__ */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/include/xen/xen_proc.h merge/include/xen/xen_proc.h
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/include/xen/xen_proc.h merge/include/xen/xen_proc.h
--- ../upstream/hg/linux-2.6/include/xen/xen_proc.h 1970-01-01 01:00:00.000000000 +0100
+++ merge/include/xen/xen_proc.h 2006-05-30 12:44:01.000000000 +0200
@@ -0,0 +1,13 @@
@@ -85631,7 +86272,7 @@
+ const char *name);
+
+#endif /* __ASM_XEN_PROC_H__ */
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/kernel/irq/manage.c merge/kernel/irq/manage.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/kernel/irq/manage.c merge/kernel/irq/manage.c
--- ../upstream/hg/linux-2.6/kernel/irq/manage.c 2006-05-13 02:59:52.000000000 +0200
+++ merge/kernel/irq/manage.c 2006-05-30 12:44:02.000000000 +0200
@@ -204,14 +204,10 @@ int setup_irq(unsigned int irq, struct i
@@ -85688,7 +86329,7 @@
if (irq >= NR_IRQS)
return;
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/kernel/Kconfig.preempt merge/kernel/Kconfig.preempt
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/kernel/Kconfig.preempt merge/kernel/Kconfig.preempt
--- ../upstream/hg/linux-2.6/kernel/Kconfig.preempt 2005-11-07 20:03:01.000000000 +0100
+++ merge/kernel/Kconfig.preempt 2006-05-30 12:44:02.000000000 +0200
@@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
@@ -85699,7 +86340,7 @@
help
This option reduces the latency of the kernel by making
all kernel code (that is not executing in a critical section)
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/lib/Makefile merge/lib/Makefile
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/lib/Makefile merge/lib/Makefile
--- ../upstream/hg/linux-2.6/lib/Makefile 2006-04-04 08:18:24.000000000 +0200
+++ merge/lib/Makefile 2006-05-30 12:44:02.000000000 +0200
@@ -48,6 +48,9 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
@@ -85712,7 +86353,7 @@
hostprogs-y := gen_crc32table
clean-files := crc32table.h
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/highmem.c merge/mm/highmem.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/highmem.c merge/mm/highmem.c
--- ../upstream/hg/linux-2.6/mm/highmem.c 2006-04-04 08:18:24.000000000 +0200
+++ merge/mm/highmem.c 2006-05-30 12:44:03.000000000 +0200
@@ -142,6 +142,17 @@ start:
@@ -85733,7 +86374,7 @@
void fastcall *kmap_high(struct page *page)
{
unsigned long vaddr;
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/Kconfig merge/mm/Kconfig
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/Kconfig merge/mm/Kconfig
--- ../upstream/hg/linux-2.6/mm/Kconfig 2006-04-04 08:18:24.000000000 +0200
+++ merge/mm/Kconfig 2006-05-30 12:44:03.000000000 +0200
@@ -126,11 +126,14 @@ comment "Memory hotplug is currently inc
@@ -85751,7 +86392,7 @@
default "4"
#
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/memory.c merge/mm/memory.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/memory.c merge/mm/memory.c
--- ../upstream/hg/linux-2.6/mm/memory.c 2006-04-04 08:18:24.000000000 +0200
+++ merge/mm/memory.c 2006-05-30 12:44:03.000000000 +0200
@@ -402,7 +402,8 @@ struct page *vm_normal_page(struct vm_ar
@@ -85903,7 +86544,7 @@
/*
* handle_pte_fault chooses page fault handler according to an entry
* which was read non-atomically. Before making any commitment, on
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/mmap.c merge/mm/mmap.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/mmap.c merge/mm/mmap.c
--- ../upstream/hg/linux-2.6/mm/mmap.c 2006-04-14 19:01:47.000000000 +0200
+++ merge/mm/mmap.c 2006-05-30 12:44:03.000000000 +0200
@@ -1942,6 +1942,10 @@ void exit_mmap(struct mm_struct *mm)
@@ -85917,7 +86558,7 @@
lru_add_drain();
flush_cache_mm(mm);
tlb = tlb_gather_mmu(mm, 1);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/mm/page_alloc.c merge/mm/page_alloc.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/page_alloc.c merge/mm/page_alloc.c
--- ../upstream/hg/linux-2.6/mm/page_alloc.c 2006-05-27 02:38:10.000000000 +0200
+++ merge/mm/page_alloc.c 2006-05-30 12:44:03.000000000 +0200
@@ -438,7 +438,8 @@ static void __free_pages_ok(struct page
@@ -85940,7 +86581,7 @@
if (PageAnon(page))
page->mapping = NULL;
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/core/dev.c merge/net/core/dev.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/core/dev.c merge/net/core/dev.c
--- ../upstream/hg/linux-2.6/net/core/dev.c 2006-05-27 02:38:11.000000000 +0200
+++ merge/net/core/dev.c 2006-05-30 12:45:46.000000000 +0200
@@ -116,6 +116,12 @@
@@ -86041,7 +86682,7 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/core/skbuff.c merge/net/core/skbuff.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/core/skbuff.c merge/net/core/skbuff.c
--- ../upstream/hg/linux-2.6/net/core/skbuff.c 2006-04-21 20:21:11.000000000 +0200
+++ merge/net/core/skbuff.c 2006-05-30 12:44:04.000000000 +0200
@@ -140,6 +140,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
@@ -86129,7 +86770,7 @@
C(pkt_type);
C(ip_summed);
C(priority);
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c merge/net/ipv4/netfilter/ip_nat_proto_tcp.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c merge/net/ipv4/netfilter/ip_nat_proto_tcp.c
--- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-01-16 01:22:34.000000000 +0100
+++ merge/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-05-30 12:44:05.000000000 +0200
@@ -129,10 +129,17 @@ tcp_manip_pkt(struct sk_buff **pskb,
@@ -86151,7 +86792,7 @@
return 1;
}
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c merge/net/ipv4/netfilter/ip_nat_proto_udp.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c merge/net/ipv4/netfilter/ip_nat_proto_udp.c
--- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-01-16 01:22:34.000000000 +0100
+++ merge/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-05-30 12:44:05.000000000 +0200
@@ -113,11 +113,19 @@ udp_manip_pkt(struct sk_buff **pskb,
@@ -86176,7 +86817,7 @@
*portptr = newport;
return 1;
}
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c merge/net/ipv4/xfrm4_output.c
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c merge/net/ipv4/xfrm4_output.c
--- ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c 2006-05-13 02:59:54.000000000 +0200
+++ merge/net/ipv4/xfrm4_output.c 2006-05-30 12:44:06.000000000 +0200
@@ -17,6 +17,8 @@
@@ -86199,7 +86840,7 @@
if (skb->ip_summed == CHECKSUM_HW) {
err = skb_checksum_help(skb, 0);
if (err)
-diff -uNrp --exclude='.*' ../upstream/hg/linux-2.6/scripts/Makefile.xen merge/scripts/Makefile.xen
+diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/scripts/Makefile.xen merge/scripts/Makefile.xen
--- ../upstream/hg/linux-2.6/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100
+++ merge/scripts/Makefile.xen 2006-05-30 12:44:09.000000000 +0200
@@ -0,0 +1,14 @@
More information about the fedora-cvs-commits
mailing list