rpms/kernel/devel kernel-2.6.spec, 1.2456, 1.2457 linux-2.6-xen.patch, 1.42, 1.43

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jul 26 21:04:17 UTC 2006


Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17135

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
daily update xen patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2456
retrieving revision 1.2457
diff -u -r1.2456 -r1.2457
--- kernel-2.6.spec	26 Jul 2006 16:18:31 -0000	1.2456
+++ kernel-2.6.spec	26 Jul 2006 21:03:28 -0000	1.2457
@@ -1647,6 +1647,10 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Juan Quintela <quintela at anano.mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+- new xen patch based on linux-2.6-xen cset 22749.
+  and linux-2.6 cset 33089.
+
 * Wed Jul 26 2006 Dave Jones <davej at redhat.com>
 - Enable sparsemem on ia64. (#108848)
 

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 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                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/time-xen.c.orig                    | 1096 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 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                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 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                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Kconfig.orig                            |  706 +++++
 arch/x86_64/Kconfig~                                |  706 +++++
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 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                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 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                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  315 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1605 +++++++++++
 drivers/xen/netfront/netfront.c.orig                | 1604 +++++++++++
 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                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 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                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 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         |  152 +
 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             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 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      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 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               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 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.h              |    6 
 include/asm-i386/page.h                             |    2 
 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                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 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                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.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       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 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/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/netdevice.h.orig                      | 1017 +++++++
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 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                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 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                   |   93 
 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                    |  157 +
 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                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 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                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 413 files changed, 90294 insertions(+), 870 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.42 -r 1.43 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- linux-2.6-xen.patch	26 Jul 2006 04:08:14 -0000	1.42
+++ linux-2.6-xen.patch	26 Jul 2006 21:03:29 -0000	1.43
@@ -1,4 +1,4 @@
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
 --- /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/arch/i386/boot-xen/Makefile	2006-07-23 00:15:23.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 --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
 --- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
 +++ compiling/arch/i386/Kconfig	2006-07-26 05:37:14.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
@@ -311,13679 +311,12433 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig~ compiling/arch/i386/Kconfig~
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig~	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/Kconfig~	2006-07-23 00:15:23.000000000 +0200
-@@ -0,0 +1,1242 @@
-+#
-+# For a description of the syntax of this configuration file,
-+# see Documentation/kbuild/kconfig-language.txt.
-+#
-+
-+mainmenu "Linux Kernel Configuration"
-+
-+config X86_32
-+	bool
-+	default y
-+	help
-+	  This is Linux's home port.  Linux was originally native to the Intel
-+	  386, and runs on all the later x86 processors including the Intel
-+	  486, 586, Pentiums, and various instruction-set-compatible chips by
-+	  AMD, Cyrix, and others.
-+
-+config GENERIC_TIME
-+	bool
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu compiling/arch/i386/Kconfig.cpu
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/Kconfig.cpu	2006-07-23 00:15:23.000000000 +0200
+@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
+ 
+ config X86_F00F_BUG
+ 	bool
+-	depends on M586MMX || M586TSC || M586 || M486 || M386
++	depends on (M586MMX || M586TSC || M586 || M486 || M386) && !X86_NO_IDT
+ 	default y
+ 
+ config X86_WP_WORKS_OK
+@@ -311,5 +311,5 @@ config X86_OOSTORE
+ 
+ config X86_TSC
+ 	bool
+-	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
++	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN
+ 	default y
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug compiling/arch/i386/Kconfig.debug
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/Kconfig.debug	2006-07-23 00:15:23.000000000 +0200
+@@ -2,6 +2,7 @@ menu "Kernel hacking"
+ 
+ config TRACE_IRQFLAGS_SUPPORT
+ 	bool
 +	depends on !X86_XEN
-+	default y
+ 	default y
+ 
+ source "lib/Kconfig.debug"
+@@ -79,6 +80,7 @@ config X86_MPPARSE
+ config DOUBLEFAULT
+ 	default y
+ 	bool "Enable doublefault exception handler" if EMBEDDED
++	depends on !X86_NO_TSS
+ 	help
+           This option allows trapping of rare doublefault exceptions that
+           would otherwise cause a system to silently reboot. Disabling this
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c compiling/arch/i386/kernel/acpi/boot-xen.c
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/acpi/boot-xen.c	2006-07-23 00:15:23.000000000 +0200
+@@ -0,0 +1,1168 @@
++/*
++ *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
++ *
++ *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh at intel.com>
++ *  Copyright (C) 2001 Jun Nakajima <jun.nakajima at intel.com>
++ *
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ */
 +
-+config LOCKDEP_SUPPORT
-+	bool
-+	depends on !X86_XEN
-+	default y
++#include <linux/init.h>
++#include <linux/acpi.h>
++#include <linux/efi.h>
++#include <linux/module.h>
++#include <linux/dmi.h>
++#include <linux/irq.h>
 +
-+config STACKTRACE_SUPPORT
-+	bool
-+	default y
++#include <asm/pgtable.h>
++#include <asm/io_apic.h>
++#include <asm/apic.h>
++#include <asm/io.h>
++#include <asm/mpspec.h>
 +
-+config SEMAPHORE_SLEEPERS
-+	bool
-+	default y
++#ifdef	CONFIG_X86_64
 +
-+config X86
-+	bool
-+	default y
++extern void __init clustered_apic_check(void);
 +
-+config MMU
-+	bool
-+	default y
++extern int gsi_irq_sharing(int gsi);
++#include <asm/proto.h>
 +
-+config SBUS
-+	bool
++static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; }
 +
-+config GENERIC_ISA_DMA
-+	bool
-+	default y
 +
-+config GENERIC_IOMAP
-+	bool
-+	default y
++#else				/* X86 */
 +
-+config GENERIC_HWEIGHT
-+	bool
-+	default y
++#ifdef	CONFIG_X86_LOCAL_APIC
++#include <mach_apic.h>
++#include <mach_mpparse.h>
++#endif				/* CONFIG_X86_LOCAL_APIC */
 +
-+config ARCH_MAY_HAVE_PC_FDC
-+	bool
-+	default y
++static inline int gsi_irq_sharing(int gsi) { return gsi; }
 +
-+config DMI
-+	bool
-+	default y
++#endif				/* X86 */
 +
-+source "init/Kconfig"
++#define BAD_MADT_ENTRY(entry, end) (					    \
++		(!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
++		((acpi_table_entry_header *)entry)->length != sizeof(*entry))
 +
-+menu "Processor type and features"
++#define PREFIX			"ACPI: "
 +
-+config SMP
-+	bool "Symmetric multi-processing support"
-+	---help---
-+	  This enables support for systems with more than one CPU. If you have
-+	  a system with only one CPU, like most personal computers, say N. If
-+	  you have a system with more than one CPU, say Y.
++int acpi_noirq __initdata;	/* skip ACPI IRQ initialization */
++int acpi_pci_disabled __initdata;	/* skip ACPI PCI scan and IRQ initialization */
[...81514 lines suppressed...]
 +++ compiling/include/xen/public/privcmd.h	2006-07-23 00:17:53.000000000 +0200
 @@ -0,0 +1,79 @@
@@ -90047,7 +93965,7 @@
 +	_IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t))
 +
 +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/include/xen/xenbus.h compiling/include/xen/xenbus.h
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/include/xen/xenbus.h compiling/include/xen/xenbus.h
 --- /mnt/ro/repos/hg/linux-2.6/include/xen/xenbus.h	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/include/xen/xenbus.h	2006-07-23 00:17:53.000000000 +0200
 @@ -0,0 +1,299 @@
@@ -90350,7 +94268,7 @@
 +
 +
 +#endif /* _XEN_XENBUS_H */
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/include/xen/xencons.h compiling/include/xen/xencons.h
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/include/xen/xencons.h compiling/include/xen/xencons.h
 --- /mnt/ro/repos/hg/linux-2.6/include/xen/xencons.h	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/include/xen/xencons.h	2006-07-23 00:17:53.000000000 +0200
 @@ -0,0 +1,14 @@
@@ -90368,7 +94286,7 @@
 +int xencons_ring_send(const char *data, unsigned len);
 +
 +#endif /* __ASM_XENCONS_H__ */
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/include/xen/xen_proc.h compiling/include/xen/xen_proc.h
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/include/xen/xen_proc.h compiling/include/xen/xen_proc.h
 --- /mnt/ro/repos/hg/linux-2.6/include/xen/xen_proc.h	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/include/xen/xen_proc.h	2006-07-23 00:17:53.000000000 +0200
 @@ -0,0 +1,13 @@
@@ -90385,7 +94303,7 @@
 +	const char *name);
 +
 +#endif /* __ASM_XEN_PROC_H__ */
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/kernel/fork.c compiling/kernel/fork.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/kernel/fork.c compiling/kernel/fork.c
 --- /mnt/ro/repos/hg/linux-2.6/kernel/fork.c	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/kernel/fork.c	2006-07-23 00:17:54.000000000 +0200
 @@ -275,6 +275,9 @@ static inline int dup_mmap(struct mm_str
@@ -90398,7 +94316,7 @@
  	retval = 0;
  out:
  	up_write(&mm->mmap_sem);
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/kernel/irq/manage.c compiling/kernel/irq/manage.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/kernel/irq/manage.c compiling/kernel/irq/manage.c
 --- /mnt/ro/repos/hg/linux-2.6/kernel/irq/manage.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/kernel/irq/manage.c	2006-07-23 00:17:54.000000000 +0200
 @@ -326,7 +326,6 @@ void free_irq(unsigned int irq, void *de
@@ -90409,7 +94327,7 @@
  	if (irq >= NR_IRQS)
  		return;
  
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/kernel/Kconfig.preempt compiling/kernel/Kconfig.preempt
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/kernel/Kconfig.preempt compiling/kernel/Kconfig.preempt
 --- /mnt/ro/repos/hg/linux-2.6/kernel/Kconfig.preempt	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/kernel/Kconfig.preempt	2006-07-23 00:17:54.000000000 +0200
 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
@@ -90420,7 +94338,7 @@
  	help
  	  This option reduces the latency of the kernel by making
  	  all kernel code (that is not executing in a critical section)
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/kernel/timer.c compiling/kernel/timer.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/kernel/timer.c compiling/kernel/timer.c
 --- /mnt/ro/repos/hg/linux-2.6/kernel/timer.c	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/kernel/timer.c	2006-07-23 00:17:57.000000000 +0200
 @@ -554,6 +554,22 @@ found:
@@ -90446,7 +94364,7 @@
  	if (time_before(hr_expires, expires))
  		return hr_expires;
  
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug compiling/lib/Kconfig.debug
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug compiling/lib/Kconfig.debug
 --- /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/lib/Kconfig.debug	2006-07-23 00:17:57.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
@@ -90458,7 +94376,7 @@
  	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
  	help
  	  If you say Y here the resulting kernel image will be slightly larger
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/lib/Makefile compiling/lib/Makefile
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Makefile compiling/lib/Makefile
 --- /mnt/ro/repos/hg/linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/lib/Makefile	2006-07-23 00:17:57.000000000 +0200
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
@@ -90471,7 +94389,7 @@
  
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/highmem.c compiling/mm/highmem.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/highmem.c compiling/mm/highmem.c
 --- /mnt/ro/repos/hg/linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/mm/highmem.c	2006-07-23 00:17:57.000000000 +0200
 @@ -142,6 +142,17 @@ start:
@@ -90492,7 +94410,7 @@
  void fastcall *kmap_high(struct page *page)
  {
  	unsigned long vaddr;
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/Kconfig compiling/mm/Kconfig
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/Kconfig compiling/mm/Kconfig
 --- /mnt/ro/repos/hg/linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/mm/Kconfig	2006-07-23 00:17:57.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
@@ -90510,7 +94428,7 @@
  	default "4"
  
  #
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/memory.c compiling/mm/memory.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/memory.c compiling/mm/memory.c
 --- /mnt/ro/repos/hg/linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/mm/memory.c	2006-07-23 00:17:57.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
@@ -90653,7 +94571,7 @@
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/mmap.c compiling/mm/mmap.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/mmap.c compiling/mm/mmap.c
 --- /mnt/ro/repos/hg/linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/mm/mmap.c	2006-07-23 00:17:57.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
@@ -90667,7 +94585,7 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
 --- /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/mm/page_alloc.c	2006-07-23 00:17:58.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
@@ -90690,7 +94608,7 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/core/dev.c compiling/net/core/dev.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/dev.c compiling/net/core/dev.c
 --- /mnt/ro/repos/hg/linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/net/core/dev.c	2006-07-23 00:46:36.000000000 +0200
 @@ -117,6 +117,12 @@
@@ -90791,7 +94709,7 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c compiling/net/core/pktgen.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c compiling/net/core/pktgen.c
 --- /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/net/core/pktgen.c	2006-07-23 00:17:59.000000000 +0200
 @@ -6,7 +6,7 @@
@@ -90803,7 +94721,7 @@
   *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
 --- /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/net/core/skbuff.c	2006-07-23 00:17:59.000000000 +0200
 @@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
@@ -90892,7 +94810,7 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
 +++ compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-23 00:18:01.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
@@ -90909,7 +94827,7 @@
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
 --- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
 +++ compiling/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-23 00:18:01.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
@@ -90926,7 +94844,7 @@
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
 --- /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
 +++ compiling/net/ipv4/xfrm4_output.c	2006-07-23 00:18:03.000000000 +0200
 @@ -18,6 +18,8 @@
@@ -90949,7 +94867,7 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
 --- /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
 +++ compiling/net/ipv6/addrconf.c	2006-07-23 00:18:03.000000000 +0200
 @@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
@@ -90968,7 +94886,7 @@
  	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
  		struct in6_addr all_routers;
  
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
 --- /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/scripts/Makefile.xen	2006-07-23 00:18:07.000000000 +0200
 @@ -0,0 +1,14 @@




More information about the fedora-cvs-commits mailing list