rpms/kernel-xen/devel kernel-xen.spec, 1.30, 1.31 linux-2.6-xen-merge.patch, 1.4, 1.5

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jan 26 22:29:35 UTC 2006


Author: quintela

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

Modified Files:
	kernel-xen.spec linux-2.6-xen-merge.patch 
Log Message:
fix type in patch hand-edited


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kernel-xen.spec	26 Jan 2006 22:14:33 -0000	1.30
+++ kernel-xen.spec	26 Jan 2006 22:29:32 -0000	1.31
@@ -1373,6 +1373,9 @@
 %endif
 
 %changelog
+* Thu Jan 26 2006 Juan Quintela <quintela at redhat.com>
+- "don't edit patches by hand" release.
+
 * Wed Jan 25 2006 Juan Quintela <quintela at redhat.com>
 - merge with rawhide kernel 1.1869.
 

linux-2.6-xen-merge.patch:
 ./arch/i386/Kconfig                                |   76 
 ./arch/i386/boot-xen/Makefile                      |   24 
 ./arch/i386/kernel/Makefile                        |   26 
 ./arch/i386/kernel/acpi/Makefile                   |    4 
 ./arch/i386/kernel/acpi/boot-xen.c                 | 1160 ++++++++
 ./arch/i386/kernel/apic-xen.c                      |   89 
 ./arch/i386/kernel/cpu/Makefile                    |    5 
 ./arch/i386/kernel/cpu/common-xen.c                |  655 +++++
 ./arch/i386/kernel/cpu/cpufreq/Kconfig             |    2 
 ./arch/i386/kernel/cpu/mtrr/Makefile               |    7 
 ./arch/i386/kernel/cpu/mtrr/main-xen.c             |  187 +
 ./arch/i386/kernel/early_printk-xen.c              |    2 
 ./arch/i386/kernel/entry-xen.S                     |  838 ++++++
 ./arch/i386/kernel/fixup.c                         |   95 
 ./arch/i386/kernel/head-xen.S                      |  169 +
 ./arch/i386/kernel/init_task-xen.c                 |   49 
 ./arch/i386/kernel/io_apic-xen.c                   | 2725 +++++++++++++++++++++
 ./arch/i386/kernel/ioport-xen.c                    |  121 
 ./arch/i386/kernel/irq-xen.c                       |  306 ++
 ./arch/i386/kernel/ldt-xen.c                       |  262 ++
 ./arch/i386/kernel/microcode-xen.c                 |  163 +
 ./arch/i386/kernel/mpparse-xen.c                   | 1167 ++++++++
 ./arch/i386/kernel/pci-dma-xen.c                   |  302 ++
 ./arch/i386/kernel/process-xen.c                   |  839 ++++++
 ./arch/i386/kernel/quirks-xen.c                    |   49 
 ./arch/i386/kernel/setup-xen.c                     | 1868 ++++++++++++++
 ./arch/i386/kernel/smp-xen.c                       |  617 ++++
 ./arch/i386/kernel/smpalts.c                       |   85 
 ./arch/i386/kernel/smpboot.c                       |   10 
 ./arch/i386/kernel/swiotlb.c                       |  671 +++++
 ./arch/i386/kernel/time-xen.c                      |  942 +++++++
 ./arch/i386/kernel/traps-xen.c                     | 1063 ++++++++
 ./arch/i386/kernel/vmlinux.lds.S                   |    7 
 ./arch/i386/kernel/vsyscall-note-xen.S             |   32 
 ./arch/i386/mach-xen/Makefile                      |    7 
 ./arch/i386/mach-xen/setup.c                       |   37 
 ./arch/i386/mm/Makefile                            |    8 
 ./arch/i386/mm/fault-xen.c                         |  628 ++++
 ./arch/i386/mm/highmem-xen.c                       |  123 
 ./arch/i386/mm/hypervisor.c                        |  459 +++
 ./arch/i386/mm/init-xen.c                          |  833 ++++++
 ./arch/i386/mm/ioremap-xen.c                       |  493 +++
 ./arch/i386/mm/pgtable-xen.c                       |  597 ++++
 ./arch/i386/pci/Makefile                           |    5 
 ./arch/i386/pci/i386-xen.c                         |  295 ++
 ./arch/i386/pci/irq-xen.c                          | 1193 +++++++++
 ./arch/i386/power/Makefile                         |    4 
 ./arch/um/kernel/physmem.c                         |    4 
 ./arch/x86_64/Makefile                             |   16 
 ./arch/x86_64/ia32/ia32entry-xen.S                 |  676 +++++
 ./arch/x86_64/ia32/syscall32-xen.c                 |  128 
 ./arch/x86_64/ia32/syscall32_syscall-xen.S         |   28 
 ./arch/x86_64/ia32/vsyscall-int80.S                |   57 
 ./arch/x86_64/ia32/vsyscall-sigreturn.S            |    2 
 ./arch/x86_64/kernel/acpi/Makefile                 |    2 
 ./arch/x86_64/kernel/apic-xen.c                    |  198 +
 ./arch/x86_64/kernel/e820-xen.c                    |  721 +++++
 ./arch/x86_64/kernel/early_printk-xen.c            |  308 ++
 ./arch/x86_64/kernel/entry-xen.S                   | 1135 ++++++++
 ./arch/x86_64/kernel/genapic-xen.c                 |  135 +
 ./arch/x86_64/kernel/genapic_xen.c                 |  162 +
 ./arch/x86_64/kernel/head-xen.S                    |  292 ++
 ./arch/x86_64/kernel/head64-xen.c                  |  127 
 ./arch/x86_64/kernel/io_apic-xen.c                 | 2115 ++++++++++++++++
 ./arch/x86_64/kernel/ioport-xen.c                  |   57 
 ./arch/x86_64/kernel/irq-xen.c                     |  158 +
 ./arch/x86_64/kernel/ldt-xen.c                     |  273 ++
 ./arch/x86_64/kernel/mpparse-xen.c                 | 1000 +++++++
 ./arch/x86_64/kernel/pci-nommu-xen.c               |   95 
 ./arch/x86_64/kernel/process-xen.c                 |  775 +++++
 ./arch/x86_64/kernel/setup-xen.c                   | 1548 +++++++++++
 ./arch/x86_64/kernel/setup64-xen.c                 |  349 ++
 ./arch/x86_64/kernel/signal-xen.c                  |  513 +++
 ./arch/x86_64/kernel/smp-xen.c                     |  590 ++++
 ./arch/x86_64/kernel/traps-xen.c                   |  967 +++++++
 ./arch/x86_64/kernel/vsyscall-xen.c                |  241 +
 ./arch/x86_64/kernel/x8664_ksyms-xen.c             |  204 +
 ./arch/x86_64/kernel/xen_entry.S                   |   41 
 ./arch/x86_64/mm/Makefile                          |   10 
 ./arch/x86_64/mm/fault-xen.c                       |  594 ++++
 ./arch/x86_64/mm/init-xen.c                        |  974 +++++++
 ./arch/x86_64/mm/pageattr-xen.c                    |  380 ++
 ./arch/x86_64/pci/Makefile                         |    8 
 ./drivers/Kconfig                                  |   11 
 ./drivers/Makefile                                 |    1 
 ./drivers/acpi/Kconfig                             |    2 
 ./drivers/acpi/tables.c                            |    7 
 ./drivers/char/mem.c                               |    6 
 ./drivers/char/tpm/Kconfig                         |   14 
 ./drivers/char/tpm/Makefile                        |    1 
 ./drivers/char/tpm/tpm.c                           |   48 
 ./drivers/char/tpm/tpm.h                           |    9 
 ./drivers/char/tpm/tpm_atmel.c                     |  102 
 ./drivers/char/tpm/tpm_nsc.c                       |  149 -
 ./drivers/char/tpm/tpm_xen.c                       |  525 ++++
 ./drivers/char/tty_io.c                            |    7 
 ./drivers/firmware/Kconfig                         |    2 
 ./drivers/ide/legacy/hd.c                          |    2 
 ./drivers/pci/Kconfig                              |    1 
 ./drivers/video/fbmon.c                            |    2 
 ./drivers/xen/Kconfig                              |  175 +
 ./drivers/xen/Makefile                             |   20 
 ./drivers/xen/balloon/Makefile                     |    2 
 ./drivers/xen/balloon/balloon.c                    |  565 ++++
 ./drivers/xen/blkback/Makefile                     |    2 
 ./drivers/xen/blkback/blkback.c                    |  590 ++++
 ./drivers/xen/blkback/common.h                     |  131 +
 ./drivers/xen/blkback/interface.c                  |  164 +
 ./drivers/xen/blkback/vbd.c                        |  103 
 ./drivers/xen/blkback/xenbus.c                     |  425 +++
 ./drivers/xen/blkfront/Kconfig                     |    6 
 ./drivers/xen/blkfront/Makefile                    |    5 
 ./drivers/xen/blkfront/blkfront.c                  |  842 ++++++
 ./drivers/xen/blkfront/block.h                     |  166 +
 ./drivers/xen/blkfront/vbd.c                       |  323 ++
 ./drivers/xen/blktap/Makefile                      |    3 
 ./drivers/xen/blktap/blktap.c                      |  910 +++++++
 ./drivers/xen/blktap/common.h                      |  118 
 ./drivers/xen/blktap/interface.c                   |  146 +
 ./drivers/xen/blktap/xenbus.c                      |  234 +
 ./drivers/xen/char/Makefile                        |    2 
 ./drivers/xen/char/mem.c                           |  157 +
 ./drivers/xen/console/Makefile                     |    2 
 ./drivers/xen/console/console.c                    |  688 +++++
 ./drivers/xen/console/xencons_ring.c               |  125 
 ./drivers/xen/core/Makefile                        |    9 
 ./drivers/xen/core/evtchn.c                        |  820 ++++++
 ./drivers/xen/core/gnttab.c                        |  480 +++
 ./drivers/xen/core/reboot.c                        |  436 +++
 ./drivers/xen/core/skbuff.c                        |  143 +
 ./drivers/xen/core/smpboot.c                       |  439 +++
 ./drivers/xen/core/xen_proc.c                      |   29 
 ./drivers/xen/evtchn/Makefile                      |    2 
 ./drivers/xen/evtchn/evtchn.c                      |  459 +++
 ./drivers/xen/net_driver_util.c                    |   67 
 ./drivers/xen/netback/Makefile                     |    2 
 ./drivers/xen/netback/common.h                     |  118 
 ./drivers/xen/netback/interface.c                  |  320 ++
 ./drivers/xen/netback/loopback.c                   |  189 +
 ./drivers/xen/netback/netback.c                    |  824 ++++++
 ./drivers/xen/netback/xenbus.c                     |  327 ++
 ./drivers/xen/netfront/Kconfig                     |    6 
 ./drivers/xen/netfront/Makefile                    |    4 
 ./drivers/xen/netfront/netfront.c                  | 1492 +++++++++++
 ./drivers/xen/privcmd/Makefile                     |    2 
 ./drivers/xen/privcmd/privcmd.c                    |  274 ++
 ./drivers/xen/tpmback/Makefile                     |    4 
 ./drivers/xen/tpmback/common.h                     |  102 
 ./drivers/xen/tpmback/interface.c                  |  200 +
 ./drivers/xen/tpmback/tpmback.c                    | 1109 ++++++++
 ./drivers/xen/tpmback/xenbus.c                     |  329 ++
 ./drivers/xen/tpmfront/Makefile                    |    2 
 ./drivers/xen/tpmfront/tpmfront.c                  |  732 +++++
 ./drivers/xen/tpmfront/tpmfront.h                  |   48 
 ./drivers/xen/util.c                               |   75 
 ./drivers/xen/xenbus/Makefile                      |    8 
 ./drivers/xen/xenbus/xenbus_client.c               |  243 +
 ./drivers/xen/xenbus/xenbus_comms.c                |  203 +
 ./drivers/xen/xenbus/xenbus_comms.h                |   50 
 ./drivers/xen/xenbus/xenbus_dev.c                  |  241 +
 ./drivers/xen/xenbus/xenbus_probe.c                | 1014 +++++++
 ./drivers/xen/xenbus/xenbus_xs.c                   |  823 ++++++
 ./fs/Kconfig                                       |    1 
 ./include/asm-i386/agp.h                           |   15 
 ./include/asm-i386/atomic.h                        |    7 
 ./include/asm-i386/bitops.h                        |   19 
 ./include/asm-i386/fixmap.h                        |   20 
 ./include/asm-i386/floppy.h                        |   43 
 ./include/asm-i386/futex.h                         |    4 
 ./include/asm-i386/highmem.h                       |    5 
 ./include/asm-i386/hw_irq.h                        |    4 
 ./include/asm-i386/hypercall.h                     |  319 ++
 ./include/asm-i386/hypervisor.h                    |  180 +
 ./include/asm-i386/io.h                            |   39 
 ./include/asm-i386/kmap_types.h                    |    3 
 ./include/asm-i386/mach-default/mach_dma_map.h     |   80 
 ./include/asm-i386/mach-default/mach_fixmap.h      |   15 
 ./include/asm-i386/mach-default/mach_io.h          |   35 
 ./include/asm-i386/mach-default/mach_mmu.h         |   18 
 ./include/asm-i386/mach-default/mach_mode.h        |    7 
 ./include/asm-i386/mach-default/mach_page.h        |   28 
 ./include/asm-i386/mach-default/mach_pgtable.h     |   45 
 ./include/asm-i386/mach-default/mach_processor.h   |   53 
 ./include/asm-i386/mach-default/mach_seg.h         |   25 
 ./include/asm-i386/mach-default/mach_setup.h       |   50 
 ./include/asm-i386/mach-default/mach_system.h      |   85 
 ./include/asm-i386/mach-default/mach_tlbflush.h    |   59 
 ./include/asm-i386/mach-xen/irq_vectors.h          |  125 
 ./include/asm-i386/mach-xen/mach_dma_map.h         |   47 
 ./include/asm-i386/mach-xen/mach_fixmap.h          |   15 
 ./include/asm-i386/mach-xen/mach_io.h              |   50 
 ./include/asm-i386/mach-xen/mach_mmu.h             |   48 
 ./include/asm-i386/mach-xen/mach_mode.h            |    7 
 ./include/asm-i386/mach-xen/mach_page.h            |  154 +
 ./include/asm-i386/mach-xen/mach_pgtable.h         |  154 +
 ./include/asm-i386/mach-xen/mach_processor.h       |   61 
 ./include/asm-i386/mach-xen/mach_seg.h             |    9 
 ./include/asm-i386/mach-xen/mach_setup.h           |   11 
 ./include/asm-i386/mach-xen/mach_system.h          |  149 +
 ./include/asm-i386/mach-xen/mach_tlbflush.h        |   10 
 ./include/asm-i386/mach-xen/setup_arch_post.h      |   40 
 ./include/asm-i386/mach-xen/setup_arch_pre.h       |    5 
 ./include/asm-i386/mmu.h                           |    6 
 ./include/asm-i386/mmu_context.h                   |   17 
 ./include/asm-i386/page.h                          |   14 
 ./include/asm-i386/pci.h                           |   31 
 ./include/asm-i386/pgalloc.h                       |   31 
 ./include/asm-i386/pgtable-2level.h                |   12 
 ./include/asm-i386/pgtable-3level.h                |   35 
 ./include/asm-i386/pgtable.h                       |   22 
 ./include/asm-i386/processor.h                     |   48 
 ./include/asm-i386/ptrace.h                        |    5 
 ./include/asm-i386/rwsem.h                         |   17 
 ./include/asm-i386/scatterlist.h                   |    9 
 ./include/asm-i386/setup.h                         |   45 
 ./include/asm-i386/smp.h                           |    5 
 ./include/asm-i386/smp_alt.h                       |   32 
 ./include/asm-i386/spinlock.h                      |   43 
 ./include/asm-i386/swiotlb.h                       |   59 
 ./include/asm-i386/synch_bitops.h                  |  142 +
 ./include/asm-i386/tlbflush.h                      |   55 
 ./include/asm-i386/vga.h                           |    2 
 ./include/asm-um/page.h                            |    2 
 ./include/asm-x86_64/arch_hooks.h                  |   31 
 ./include/asm-x86_64/bootsetup.h                   |   10 
 ./include/asm-x86_64/fixmap.h                      |   21 
 ./include/asm-x86_64/floppy.h                      |   45 
 ./include/asm-x86_64/hw_irq.h                      |   14 
 ./include/asm-x86_64/hypercall.h                   |  320 ++
 ./include/asm-x86_64/hypervisor.h                  |    2 
 ./include/asm-x86_64/io.h                          |   47 
 ./include/asm-x86_64/ipi.h                         |    8 
 ./include/asm-x86_64/irq.h                         |   39 
 ./include/asm-x86_64/mach-xen/asm/page.h           |  257 +
 ./include/asm-x86_64/mach-xen/asm/param.h          |   23 
 ./include/asm-x86_64/mach-xen/asm/pci.h            |  177 +
 ./include/asm-x86_64/mach-xen/asm/pgalloc.h        |  198 +
 ./include/asm-x86_64/mach-xen/asm/pgtable.h        |  590 ++++
 ./include/asm-x86_64/mach-xen/asm/processor.h      |  505 +++
 ./include/asm-x86_64/mach-xen/asm/ptrace.h         |  125 
 ./include/asm-x86_64/mach-xen/asm/segment.h        |   46 
 ./include/asm-x86_64/mach-xen/asm/smp.h            |  150 +
 ./include/asm-x86_64/mach-xen/asm/system.h         |  411 +++
 ./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/mach_time.h          |  122 
 ./include/asm-x86_64/mach-xen/mach_timer.h         |   48 
 ./include/asm-x86_64/mach-xen/setup_arch_post.h    |   47 
 ./include/asm-x86_64/mach-xen/setup_arch_pre.h     |    5 
 ./include/asm-x86_64/mmu.h                         |   13 
 ./include/asm-x86_64/synch_bitops.h                |    1 
 ./include/linux/gfp.h                              |    6 
 ./include/linux/highmem.h                          |    6 
 ./include/linux/irq.h                              |    3 
 ./include/linux/mm.h                               |   13 
 ./include/linux/skbuff.h                           |   13 
 ./include/xen/balloon.h                            |   70 
 ./include/xen/driver_util.h                        |   26 
 ./include/xen/evtchn.h                             |  123 
 ./include/xen/foreign_page.h                       |   40 
 ./include/xen/gnttab.h                             |   98 
 ./include/xen/interface/acm.h                      |  181 +
 ./include/xen/interface/acm_ops.h                  |   96 
 ./include/xen/interface/arch-ia64.h                |  279 ++
 ./include/xen/interface/arch-x86_32.h              |  152 +
 ./include/xen/interface/arch-x86_64.h              |  221 +
 ./include/xen/interface/dom0_ops.h                 |  482 +++
 ./include/xen/interface/event_channel.h            |  203 +
 ./include/xen/interface/grant_table.h              |  306 ++
 ./include/xen/interface/hvm/hvm_info_table.h       |   24 
 ./include/xen/interface/hvm/ioreq.h                |   90 
 ./include/xen/interface/hvm/vmx_assist.h           |   97 
 ./include/xen/interface/io/blkif.h                 |   85 
 ./include/xen/interface/io/console.h               |   33 
 ./include/xen/interface/io/netif.h                 |   76 
 ./include/xen/interface/io/ring.h                  |  270 ++
 ./include/xen/interface/io/tpmif.h                 |   56 
 ./include/xen/interface/io/vmx_vlapic.h            |   58 
 ./include/xen/interface/io/vmx_vpic.h              |   85 
 ./include/xen/interface/io/xenbus.h                |   44 
 ./include/xen/interface/io/xs_wire.h               |   97 
 ./include/xen/interface/memory.h                   |  101 
 ./include/xen/interface/physdev.h                  |   70 
 ./include/xen/interface/sched.h                    |   60 
 ./include/xen/interface/sched_ctl.h                |   68 
 ./include/xen/interface/trace.h                    |   90 
 ./include/xen/interface/vcpu.h                     |   64 
 ./include/xen/interface/version.h                  |   52 
 ./include/xen/interface/xen.h                      |  441 +++
 ./include/xen/net_driver_util.h                    |   56 
 ./include/xen/public/evtchn.h                      |   98 
 ./include/xen/public/privcmd.h                     |   91 
 ./include/xen/public/xenstored.h                   |   89 
 ./include/xen/tpmfe.h                              |   33 
 ./include/xen/xen_proc.h                           |   23 
 ./include/xen/xenbus.h                             |  252 +
 ./include/xen/xencons.h                            |   14 
 ./kernel/Kconfig.preempt                           |    1 
 ./kernel/irq/manage.c                              |   84 
 ./lib/Kconfig.debug                                |    2 
 ./lib/Makefile                                     |    2 
 ./mm/Kconfig                                       |    3 
 ./mm/highmem.c                                     |   11 
 ./mm/memory.c                                      |  118 
 ./mm/mmap.c                                        |    4 
 ./net/core/dev.c                                   |   50 
 ./net/core/skbuff.c                                |   41 
 ./scripts/Makefile.xen                             |   14 
 linux-2.6.15.i686/arch/i386/Makefile               |   18 
 linux-2.6.15.i686/arch/x86_64/Kconfig              |   40 
 linux-2.6.15.i686/arch/x86_64/ia32/Makefile        |   18 
 linux-2.6.15.i686/arch/x86_64/kernel/Makefile      |   21 
 linux-2.6.15.i686/arch/x86_64/kernel/pci-dma.c     |    0 
 linux-2.6.15.i686/arch/x86_64/kernel/pci-gart.c    |   10 
 linux-2.6.15.i686/drivers/acpi/processor_idle.c    |    4 
 linux-2.6.15.i686/include/asm-i386/desc.h          |   51 
 linux-2.6.15.i686/include/asm-i386/dma-mapping.h   |  102 
 linux-2.6.15.i686/include/asm-i386/segment.h       |   41 
 linux-2.6.15.i686/include/asm-i386/system.h        |  138 -
 linux-2.6.15.i686/include/asm-x86_64/desc.h        |   41 
 linux-2.6.15.i686/include/asm-x86_64/dma-mapping.h |   34 
 linux-2.6.15.i686/include/asm-x86_64/mmu_context.h |   97 
 linux-2.6.15.i686/include/asm-x86_64/swiotlb.h     |   19 
 linux-2.6.15.i686/mm/page_alloc.c                  |    7 
 326 files changed, 64235 insertions(+), 721 deletions(-)

Index: linux-2.6-xen-merge.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-xen-merge.patch	26 Jan 2006 22:14:34 -0000	1.4
+++ linux-2.6-xen-merge.patch	26 Jan 2006 22:29:32 -0000	1.5
@@ -46228,7 +46228,7 @@
 +__setup("kstack=", kstack_setup);
 --- /dev/null	2006-01-06 04:48:52.917188312 -0500
 +++ ./arch/i386/kernel/irq-xen.c	2006-01-06 16:04:34.000000000 -0500
-@@ -0,1 +1,307 @@
+@@ -0,0 +1,306 @@
 +/*
 + *	linux/arch/i386/kernel/irq.c
 + *




More information about the fedora-cvs-commits mailing list