rpms/kernel/devel kernel-2.6.spec, 1.2182, 1.2183 linux-2.6-xen.patch, 1.16, 1.17
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 2 10:01:06 UTC 2006
- Previous message (by thread): rpms/kernel/devel .cvsignore,1.419,1.420 sources,1.361,1.362
- Next message (by thread): rpms/apr/devel apr-1.2.7-pkgconf.patch, NONE, 1.1 apr-1.2.7.tar.gz.asc, NONE, 1.1 .cvsignore, 1.7, 1.8 apr.spec, 1.49, 1.50 sources, 1.7, 1.8 upstream, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: quintela
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21386
Modified Files:
kernel-2.6.spec linux-2.6-xen.patch
Log Message:
rebase with 22455 linux-2.6-xen
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2182
retrieving revision 1.2183
diff -u -r1.2182 -r1.2183
--- kernel-2.6.spec 2 May 2006 01:53:49 -0000 1.2182
+++ kernel-2.6.spec 2 May 2006 10:00:40 -0000 1.2183
@@ -9,7 +9,7 @@
# Whether to apply the Xen patches, leave this enabled.
%define includexen 1
# Whether to build the Xen kernels, disable if you want.
-%define buildxen 0
+%define buildxen 1
%define buildxenPAE 0
%define builddoc 0
%define buildkdump 1
@@ -194,7 +194,7 @@
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-20060413.tar.bz2
+Source1: xen-20060428.tar.bz2
Source2: Config.mk
Source10: COPYING.modules
@@ -720,13 +720,6 @@
%if %{includexen}
cp %{SOURCE2} .
-%if %{buildxen}
-# Sometimes we accidentally import an unclean Xen tarball
- if [ -x xen/tools/figlet/figlet ]; then
- echo "Xen tarball is unclean. Use an unbuilt Xen tarball"
- exit 1
- fi
-%endif
mv xen xen-vanilla
cp %{SOURCE2} .
%endif
@@ -1718,6 +1711,11 @@
%endif
%changelog
+* Tue May 2 2006 Juan Quintela <quintela at redhat.com>
+- rebase on linux-2.6 & linux-2.6-xen as of May,1st.
+- new HV from xen-unstable as of 20060428.
+- fixed the binaries included on xen tarball :p
+
* Mon May 1 2006 Dave Jones <davej at redhat.com>
- 2.6.17rc3-git4
linux-2.6-xen.patch:
arch/i386/Kconfig | 94
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 | 1170 ++++++++
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 | 96
arch/i386/kernel/head-xen.S | 171 +
arch/i386/kernel/init_task-xen.c | 51
arch/i386/kernel/io_apic-xen.c | 2748 ++++++++++++++++++++
arch/i386/kernel/ioport-xen.c | 122
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 | 1176 ++++++++
arch/i386/kernel/pci-dma-xen.c | 354 ++
arch/i386/kernel/process-xen.c | 824 +++++
arch/i386/kernel/quirks-xen.c | 48
arch/i386/kernel/setup-xen.c | 1854 +++++++++++++
arch/i386/kernel/smp-xen.c | 613 ++++
arch/i386/kernel/swiotlb.c | 674 ++++
arch/i386/kernel/sysenter.c | 102
arch/i386/kernel/time-xen.c | 1097 +++++++
arch/i386/kernel/traps-xen.c | 1137 ++++++++
arch/i386/kernel/traps.c | 9
arch/i386/kernel/vm86.c | 8
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 | 424 +++
arch/i386/mm/init-xen.c | 855 ++++++
arch/i386/mm/ioremap-xen.c | 486 +++
arch/i386/mm/pageattr.c | 2
arch/i386/mm/pgtable-xen.c | 652 ++++
arch/i386/mm/pgtable.c | 12
arch/i386/oprofile/Makefile | 4
arch/i386/oprofile/xenoprof.c | 441 +++
arch/i386/pci/Makefile | 9
arch/i386/pci/irq-xen.c | 1205 ++++++++
arch/i386/pci/pcifront.c | 55
arch/i386/power/Makefile | 4
arch/ia64/Kconfig | 58
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 | 66
arch/ia64/kernel/irq_ia64.c | 13
arch/ia64/kernel/pal.S | 5
arch/ia64/kernel/setup.c | 38
arch/ia64/xen/Makefile | 8
arch/ia64/xen/drivers/Makefile | 20
arch/ia64/xen/drivers/README | 2
arch/ia64/xen/drivers/coreMakefile | 26
arch/ia64/xen/drivers/evtchn_ia64.c | 273 +
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 | 56
arch/ia64/xen/hypercall.S | 353 ++
arch/ia64/xen/hypervisor.c | 234 +
arch/ia64/xen/xen_ksyms.c | 12
arch/ia64/xen/xenconsole.c | 19
arch/ia64/xen/xenentry.S | 869 ++++++
arch/ia64/xen/xenhpski.c | 19
arch/ia64/xen/xenivt.S | 2038 ++++++++++++++
arch/ia64/xen/xenminstate.h | 367 ++
arch/ia64/xen/xenpal.S | 76
arch/ia64/xen/xensetup.S | 35
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 | 725 +++++
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 | 777 +++++
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 | 164 +
arch/x86_64/kernel/head64-xen.c | 140 +
arch/x86_64/kernel/init_task.c | 3
arch/x86_64/kernel/io_apic-xen.c | 2229 ++++++++++++++++
arch/x86_64/kernel/ioport-xen.c | 58
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 | 1002 +++++++
arch/x86_64/kernel/pci-swiotlb-xen.c | 54
arch/x86_64/kernel/process-xen.c | 802 +++++
arch/x86_64/kernel/setup-xen.c | 1679 ++++++++++++
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 | 1025 +++++++
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 | 1176 ++++++++
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 | 1
drivers/char/tpm/tpm.c | 44
drivers/char/tpm/tpm.h | 7
drivers/char/tpm/tpm_xen.c | 536 +++
drivers/char/tty_io.c | 7
drivers/firmware/Kconfig | 2
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 | 223 +
drivers/xen/Makefile | 22
drivers/xen/balloon/Makefile | 2
drivers/xen/balloon/balloon.c | 592 ++++
drivers/xen/blkback/Makefile | 3
drivers/xen/blkback/blkback.c | 597 ++++
drivers/xen/blkback/common.h | 145 +
drivers/xen/blkback/interface.c | 181 +
drivers/xen/blkback/vbd.c | 126
drivers/xen/blkback/xenbus.c | 421 +++
drivers/xen/blkfront/Kconfig | 6
drivers/xen/blkfront/Makefile | 5
drivers/xen/blkfront/blkfront.c | 819 +++++
drivers/xen/blkfront/block.h | 165 +
drivers/xen/blkfront/vbd.c | 327 ++
drivers/xen/blktap/Makefile | 3
drivers/xen/blktap/blktap.c | 910 ++++++
drivers/xen/blktap/common.h | 110
drivers/xen/blktap/interface.c | 143 +
drivers/xen/blktap/xenbus.c | 233 +
drivers/xen/char/Makefile | 2
drivers/xen/char/mem.c | 192 +
drivers/xen/console/Makefile | 2
drivers/xen/console/console.c | 648 ++++
drivers/xen/console/xencons_ring.c | 151 +
drivers/xen/core/Makefile | 11
drivers/xen/core/evtchn.c | 869 ++++++
drivers/xen/core/features.c | 30
drivers/xen/core/gnttab.c | 471 +++
drivers/xen/core/hypervisor_sysfs.c | 57
drivers/xen/core/reboot.c | 381 ++
drivers/xen/core/skbuff.c | 144 +
drivers/xen/core/smpboot.c | 576 ++++
drivers/xen/core/xen_proc.c | 29
drivers/xen/core/xen_sysfs.c | 311 ++
drivers/xen/evtchn/Makefile | 2
drivers/xen/evtchn/evtchn.c | 464 +++
drivers/xen/net_driver_util.c | 68
drivers/xen/netback/Makefile | 5
drivers/xen/netback/common.h | 133
drivers/xen/netback/interface.c | 328 ++
drivers/xen/netback/loopback.c | 254 +
drivers/xen/netback/netback.c | 864 ++++++
drivers/xen/netback/xenbus.c | 366 ++
drivers/xen/netfront/Kconfig | 6
drivers/xen/netfront/Makefile | 4
drivers/xen/netfront/netfront.c | 1522 +++++++++++
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 | 453 +++
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 | 303 ++
drivers/xen/tpmback/Makefile | 4
drivers/xen/tpmback/common.h | 92
drivers/xen/tpmback/interface.c | 193 +
drivers/xen/tpmback/tpmback.c | 1061 +++++++
drivers/xen/tpmback/xenbus.c | 316 ++
drivers/xen/tpmfront/Makefile | 2
drivers/xen/tpmfront/tpmfront.c | 767 +++++
drivers/xen/tpmfront/tpmfront.h | 40
drivers/xen/util.c | 80
drivers/xen/xenbus/Makefile | 12
drivers/xen/xenbus/xenbus_backend_client.c | 144 +
drivers/xen/xenbus/xenbus_client.c | 284 ++
drivers/xen/xenbus/xenbus_comms.c | 218 +
drivers/xen/xenbus/xenbus_comms.h | 53
drivers/xen/xenbus/xenbus_dev.c | 255 +
drivers/xen/xenbus/xenbus_probe.c | 1093 +++++++
drivers/xen/xenbus/xenbus_xs.c | 856 ++++++
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 | 156 +
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 | 357 ++
include/asm-i386/mach-xen/asm/hypervisor.h | 225 +
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 | 326 ++
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 | 85
include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
include/asm-i386/mach-xen/asm/pgtable-3level.h | 183 +
include/asm-i386/mach-xen/asm/pgtable.h | 520 +++
include/asm-i386/mach-xen/asm/processor.h | 754 +++++
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 | 576 ++++
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 | 69
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/hypercall.h | 473 +++
include/asm-ia64/hypervisor.h | 174 +
include/asm-ia64/intel_intrin.h | 68
include/asm-ia64/io.h | 52
include/asm-ia64/iosapic.h | 2
include/asm-ia64/machvec.h | 15
include/asm-ia64/meminit.h | 5
include/asm-ia64/page.h | 72
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 | 61
include/asm-ia64/system.h | 4
include/asm-ia64/xen/privop.h | 282 ++
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/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 | 357 ++
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 | 317 ++
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 | 13
include/linux/oprofile.h | 8
include/linux/pfn.h | 2
include/linux/skbuff.h | 13
include/xen/balloon.h | 73
include/xen/driver_util.h | 26
include/xen/evtchn.h | 126
include/xen/features.h | 20
include/xen/foreign_page.h | 40
include/xen/gnttab.h | 160 +
include/xen/hypervisor_sysfs.h | 32
include/xen/interface/acm.h | 187 +
include/xen/interface/acm_ops.h | 98
include/xen/interface/arch-ia64.h | 375 ++
include/xen/interface/arch-x86_32.h | 199 +
include/xen/interface/arch-x86_64.h | 272 +
include/xen/interface/callback.h | 63
include/xen/interface/dom0_ops.h | 533 +++
include/xen/interface/event_channel.h | 211 +
include/xen/interface/features.h | 53
include/xen/interface/grant_table.h | 311 ++
include/xen/interface/hvm/hvm_info_table.h | 24
include/xen/interface/hvm/ioreq.h | 94
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 | 84
include/xen/interface/io/pciif.h | 55
include/xen/interface/io/ring.h | 265 +
include/xen/interface/io/tpmif.h | 56
include/xen/interface/io/xenbus.h | 42
include/xen/interface/io/xs_wire.h | 97
include/xen/interface/memory.h | 155 +
include/xen/interface/nmi.h | 59
include/xen/interface/physdev.h | 71
include/xen/interface/sched.h | 100
include/xen/interface/sched_ctl.h | 64
include/xen/interface/trace.h | 86
include/xen/interface/vcpu.h | 119
include/xen/interface/version.h | 64
include/xen/interface/xen-compat.h | 39
include/xen/interface/xen.h | 461 +++
include/xen/interface/xenoprof.h | 91
include/xen/net_driver_util.h | 58
include/xen/pcifront.h | 39
include/xen/public/evtchn.h | 101
include/xen/public/privcmd.h | 94
include/xen/tpmfe.h | 40
include/xen/xen_proc.h | 23
include/xen/xenbus.h | 306 ++
include/xen/xencons.h | 14
kernel/Kconfig.preempt | 1
kernel/irq/manage.c | 26
lib/Kconfig.debug | 31
lib/Makefile | 3
mm/Kconfig | 3
mm/highmem.c | 11
mm/memory.c | 116
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
407 files changed, 81814 insertions(+), 269 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.16 -r 1.17 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-xen.patch 28 Apr 2006 19:47:28 -0000 1.16
+++ linux-2.6-xen.patch 2 May 2006 10:00:40 -0000 1.17
@@ -1,6 +1,6 @@
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile new/arch/i386/boot-xen/Makefile
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/boot-xen/Makefile 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/boot-xen/Makefile 2006-05-01 16:37:04.000000000 +0200
@@ -0,0 +1,21 @@
+
+OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
+ 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 -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/Kconfig new/arch/i386/Kconfig
---- ../upstream/hg/linux-2.6/arch/i386/Kconfig 2006-04-14 19:01:33.000000000 +0200
-+++ new/arch/i386/Kconfig 2006-04-24 23:54:19.000000000 +0200
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../upstream/hg/linux-2.6/arch/i386/Kconfig merge/arch/i386/Kconfig
+--- ../upstream/hg/linux-2.6/arch/i386/Kconfig 2006-04-29 11:08:51.000000000 +0200
++++ merge/arch/i386/Kconfig 2006-05-01 23:00:57.000000000 +0200
@@ -91,6 +91,15 @@ config X86_PC
help
Choose this option if your computer is a standard PC or compatible.
@@ -188,12 +188,12 @@
help
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
-@@ -780,7 +780,7 @@ config PHYSICAL_START
+@@ -756,7 +780,7 @@ config PHYSICAL_START
config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
- depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
-+ depends on SMP && HOTPLUG && EXPERIMENTAL && (!X86_VOYAGER || X86_XEN)
++ depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER && (!X86_PC || X86_XEN)
---help---
Say Y here to experiment with turning CPUs off and on. CPUs
can be controlled through /sys/devices/system/cpu.
@@ -324,9 +324,9 @@
config KTIME_SCALAR
bool
default y
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu new/arch/i386/Kconfig.cpu
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/Kconfig.cpu 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/Kconfig.cpu 2006-05-01 16:37:04.000000000 +0200
@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -336,9 +336,9 @@
default y
config X86_WP_WORKS_OK
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug new/arch/i386/Kconfig.debug
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/Kconfig.debug 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/Kconfig.debug 2006-05-01 16:37:04.000000000 +0200
@@ -84,6 +84,7 @@ config X86_MPPARSE
config DOUBLEFAULT
default y
@@ -347,9 +347,9 @@
help
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c new/arch/i386/kernel/acpi/boot-xen.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/acpi/boot-xen.c 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/acpi/boot-xen.c 2006-05-01 16:37:04.000000000 +0200
@@ -0,0 +1,1170 @@
+/*
+ * boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1521,9 +1521,9 @@
+
+ return 0;
+}
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile new/arch/i386/kernel/acpi/Makefile
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/acpi/Makefile 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/acpi/Makefile 2006-05-01 16:37:04.000000000 +0200
@@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
@@ -1532,9 +1532,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c new/arch/i386/kernel/apic-xen.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/apic-xen.c 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/apic-xen.c 2006-05-01 16:37:04.000000000 +0200
@@ -0,0 +1,160 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -1696,9 +1696,9 @@
+
+ return 0;
+}
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c new/arch/i386/kernel/asm-offsets.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/asm-offsets.c 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/asm-offsets.c 2006-05-01 16:37:04.000000000 +0200
@@ -13,6 +13,7 @@
#include <asm/fixmap.h>
#include <asm/processor.h>
@@ -1725,9 +1725,9 @@
- DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
+ DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
}
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c new/arch/i386/kernel/cpu/common-xen.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/cpu/common-xen.c 2006-04-25 12:35:17.000000000 +0200
++++ merge/arch/i386/kernel/cpu/common-xen.c 2006-05-01 16:37:04.000000000 +0200
@@ -0,0 +1,732 @@
+#include <linux/init.h>
+#include <linux/string.h>
@@ -2461,9 +2461,9 @@
+ per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
+}
+#endif
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile new/arch/i386/kernel/cpu/Makefile
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/cpu/Makefile 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/cpu/Makefile 2006-05-01 16:37:04.000000000 +0200
@@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
@@ -2473,9 +2473,9 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c new/arch/i386/kernel/cpu/mtrr/main-xen.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-05-01 16:37:04.000000000 +0200
@@ -0,0 +1,197 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
@@ -2674,9 +2674,9 @@
+}
+
+subsys_initcall(mtrr_init);
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile new/arch/i386/kernel/cpu/mtrr/Makefile
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/cpu/mtrr/Makefile 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/cpu/mtrr/Makefile 2006-05-01 16:37:04.000000000 +0200
@@ -3,3 +3,10 @@ obj-y += amd.o
obj-y += cyrix.o
obj-y += centaur.o
@@ -2688,15 +2688,15 @@
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c new/arch/i386/kernel/early_printk-xen.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/early_printk-xen.c 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/early_printk-xen.c 2006-05-01 16:37:05.000000000 +0200
@@ -0,0 +1,2 @@
+
+#include "../../x86_64/kernel/early_printk-xen.c"
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S new/arch/i386/kernel/entry.S
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/entry.S 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/entry.S 2006-05-01 16:37:05.000000000 +0200
@@ -177,7 +177,7 @@ need_resched:
# sysenter call handler stub
@@ -2742,9 +2742,9 @@
pushfl; \
pushl $__KERNEL_CS; \
pushl $sysenter_past_esp
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S new/arch/i386/kernel/entry-xen.S
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/arch/i386/kernel/entry-xen.S 2006-04-24 23:54:19.000000000 +0200
++++ merge/arch/i386/kernel/entry-xen.S 2006-05-01 16:37:05.000000000 +0200
@@ -0,0 +1,903 @@
+/*
+ * linux/arch/i386/entry.S
@@ -3649,9 +3649,9 @@
+#include "syscall_table.S"
+
[...7847 lines suppressed...]
@@ -83727,9 +85152,9 @@
+ * tab-width: 8
+ * End:
+ */
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/kernel/irq/manage.c new/kernel/irq/manage.c
---- ../upstream/hg/linux-2.6/kernel/irq/manage.c 2006-04-04 08:18:24.000000000 +0200
-+++ new/kernel/irq/manage.c 2006-04-24 23:56:56.000000000 +0200
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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-04-29 11:08:51.000000000 +0200
++++ merge/kernel/irq/manage.c 2006-05-01 22:54:31.000000000 +0200
@@ -204,14 +204,10 @@ int setup_irq(unsigned int irq, struct i
p = &desc->action;
if ((old = *p) != NULL) {
@@ -83761,7 +85186,7 @@
if (!shared) {
desc->depth = 0;
desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT |
-@@ -236,14 +236,6 @@ int setup_irq(unsigned int irq, struct i
+@@ -243,14 +236,6 @@ int setup_irq(unsigned int irq, struct i
register_handler_proc(irq, new);
return 0;
@@ -83776,7 +85201,7 @@
}
/**
-@@ -271,7 +258,6 @@ void free_irq(unsigned int irq, void *de
+@@ -273,7 +258,6 @@ void free_irq(unsigned int irq, void *de
struct irqaction **p;
unsigned long flags;
@@ -83784,9 +85209,9 @@
if (irq >= NR_IRQS)
return;
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/kernel/Kconfig.preempt new/kernel/Kconfig.preempt
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/kernel/Kconfig.preempt 2006-04-24 23:56:56.000000000 +0200
++++ merge/kernel/Kconfig.preempt 2006-05-01 16:39:29.000000000 +0200
@@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
config PREEMPT
@@ -83795,9 +85220,9 @@
help
This option reduces the latency of the kernel by making
all kernel code (that is not executing in a critical section)
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/lib/Kconfig.debug new/lib/Kconfig.debug
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../upstream/hg/linux-2.6/lib/Kconfig.debug merge/lib/Kconfig.debug
--- ../upstream/hg/linux-2.6/lib/Kconfig.debug 2006-04-20 13:58:49.000000000 +0200
-+++ new/lib/Kconfig.debug 2006-04-24 23:56:57.000000000 +0200
++++ merge/lib/Kconfig.debug 2006-05-01 16:39:31.000000000 +0200
@@ -78,17 +78,13 @@ config SCHEDSTATS
this adds.
@@ -83858,9 +85283,9 @@
config FORCED_INLINING
bool "Force gcc to inline functions marked 'inline'"
depends on DEBUG_KERNEL
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/lib/Makefile new/lib/Makefile
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/lib/Makefile 2006-04-24 23:56:57.000000000 +0200
++++ merge/lib/Makefile 2006-05-01 16:39:31.000000000 +0200
@@ -48,6 +48,9 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
@@ -83871,9 +85296,9 @@
hostprogs-y := gen_crc32table
clean-files := crc32table.h
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/mm/highmem.c new/mm/highmem.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/mm/highmem.c 2006-04-24 23:56:58.000000000 +0200
++++ merge/mm/highmem.c 2006-05-01 16:39:32.000000000 +0200
@@ -142,6 +142,17 @@ start:
return vaddr;
}
@@ -83892,9 +85317,9 @@
void fastcall *kmap_high(struct page *page)
{
unsigned long vaddr;
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/mm/Kconfig new/mm/Kconfig
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/mm/Kconfig 2006-04-24 23:56:58.000000000 +0200
++++ merge/mm/Kconfig 2006-05-01 16:39:32.000000000 +0200
@@ -126,11 +126,14 @@ comment "Memory hotplug is currently inc
# Default to 4 for wider testing, though 8 might be more appropriate.
# ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -83910,9 +85335,9 @@
default "4"
#
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/mm/memory.c new/mm/memory.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/mm/memory.c 2006-04-24 23:56:58.000000000 +0200
++++ merge/mm/memory.c 2006-05-01 16:39:32.000000000 +0200
@@ -402,7 +402,8 @@ struct page *vm_normal_page(struct vm_ar
* and that the resulting page looks ok.
*/
@@ -84050,9 +85475,9 @@
/*
* handle_pte_fault chooses page fault handler according to an entry
* which was read non-atomically. Before making any commitment, on
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/mm/mmap.c new/mm/mmap.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/mm/mmap.c 2006-04-24 23:56:58.000000000 +0200
++++ merge/mm/mmap.c 2006-05-01 16:39:32.000000000 +0200
@@ -1942,6 +1942,10 @@ void exit_mmap(struct mm_struct *mm)
unsigned long nr_accounted = 0;
unsigned long end;
@@ -84064,9 +85489,9 @@
lru_add_drain();
flush_cache_mm(mm);
tlb = tlb_gather_mmu(mm, 1);
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/mm/page_alloc.c new/mm/page_alloc.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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-04-26 18:04:20.000000000 +0200
-+++ new/mm/page_alloc.c 2006-04-26 23:35:21.000000000 +0200
++++ merge/mm/page_alloc.c 2006-05-01 16:39:32.000000000 +0200
@@ -437,7 +437,8 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;
@@ -84087,9 +85512,9 @@
if (PageAnon(page))
page->mapping = NULL;
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/core/dev.c new/net/core/dev.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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-04-21 20:21:11.000000000 +0200
-+++ new/net/core/dev.c 2006-04-26 23:37:54.000000000 +0200
++++ merge/net/core/dev.c 2006-05-01 16:39:34.000000000 +0200
@@ -116,6 +116,12 @@
#include <asm/current.h>
#include <linux/audit.h>
@@ -84188,9 +85613,9 @@
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
EXPORT_SYMBOL(br_handle_frame_hook);
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/core/skbuff.c new/net/core/skbuff.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/net/core/skbuff.c 2006-04-24 23:57:00.000000000 +0200
++++ merge/net/core/skbuff.c 2006-05-01 16:39:34.000000000 +0200
@@ -140,6 +140,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
@@ -84276,9 +85701,9 @@
C(pkt_type);
C(ip_summed);
C(priority);
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c new/net/ipv4/netfilter/ip_nat_proto_tcp.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-04-25 12:34:00.000000000 +0200
++++ merge/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-05-01 16:39:35.000000000 +0200
@@ -129,10 +129,17 @@ tcp_manip_pkt(struct sk_buff **pskb,
if (hdrsize < sizeof(*hdr))
return 1;
@@ -84298,9 +85723,9 @@
return 1;
}
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c new/net/ipv4/netfilter/ip_nat_proto_udp.c
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-04-25 12:34:00.000000000 +0200
++++ merge/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-05-01 16:39:35.000000000 +0200
@@ -113,11 +113,19 @@ udp_manip_pkt(struct sk_buff **pskb,
newport = tuple->dst.u.udp.port;
portptr = &hdr->dest;
@@ -84323,9 +85748,9 @@
*portptr = newport;
return 1;
}
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c new/net/ipv4/xfrm4_output.c
---- ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c 2006-02-18 11:50:03.000000000 +0100
-+++ new/net/ipv4/xfrm4_output.c 2006-04-24 23:57:05.000000000 +0200
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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-01 22:51:51.000000000 +0200
++++ merge/net/ipv4/xfrm4_output.c 2006-05-01 23:04:37.000000000 +0200
@@ -17,6 +17,8 @@
#include <net/xfrm.h>
#include <net/icmp.h>
@@ -84346,9 +85771,9 @@
if (skb->ip_summed == CHECKSUM_HW) {
err = skb_checksum_help(skb, 0);
if (err)
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ../upstream/hg/linux-2.6/scripts/Makefile.xen new/scripts/Makefile.xen
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --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
-+++ new/scripts/Makefile.xen 2006-04-24 23:57:09.000000000 +0200
++++ merge/scripts/Makefile.xen 2006-05-01 16:39:40.000000000 +0200
@@ -0,0 +1,14 @@
+
+# cherrypickxen($1 = allobj)
- Previous message (by thread): rpms/kernel/devel .cvsignore,1.419,1.420 sources,1.361,1.362
- Next message (by thread): rpms/apr/devel apr-1.2.7-pkgconf.patch, NONE, 1.1 apr-1.2.7.tar.gz.asc, NONE, 1.1 .cvsignore, 1.7, 1.8 apr.spec, 1.49, 1.50 sources, 1.7, 1.8 upstream, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list