Merge up to 2.4.15
********
* NOTE *
********
You do _not_ want to use this yet, this is a "pure" 2.4.15 merge, including the
inode.c problems. Just being pedantic about the whole thing as we clone
off a 2.5.0 tree, a 2.4.16 merge will happen as soon as the tree is cloned off.
Date: Mon Nov 26 13:14:43 PST 2001
Workarea: stout.americas.sgi.com:/localhome/eric/merge/workarea
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: 2.4.x-xfs:slinx:107304a
linux/net/ipv4/ipconfig.c - 1.24
linux/mm/filemap.c - 1.101
linux/kernel/signal.c - 1.20
linux/kernel/sched.c - 1.46
linux/kernel/ksyms.c - 1.120
linux/kernel/fork.c - 1.38
linux/kernel/exit.c - 1.33
linux/include/linux/sched.h - 1.48
linux/include/linux/quota.h - 1.7
linux/include/linux/pci.h - 1.53
linux/include/linux/mm.h - 1.75
linux/include/linux/fs.h - 1.135
linux/include/linux/blkdev.h - 1.43
linux/include/asm-alpha/spinlock.h - 1.12
linux/include/asm-alpha/semaphore.h - 1.10
linux/fs/sysv/file.c - 1.12
linux/fs/super.c - 1.68
linux/fs/nfs/write.c - 1.31
linux/fs/minix/file.c - 1.13
linux/fs/inode.c - 1.58
linux/fs/fat/inode.c - 1.28
linux/fs/ext2/inode.c - 1.34
linux/fs/dquot.c - 1.44
linux/fs/buffer.c - 1.96
linux/fs/block_dev.c - 1.32
linux/drivers/usb/usb.c - 1.58
linux/drivers/pci/pci.c - 1.48
linux/arch/sparc64/kernel/smp.c - 1.32
linux/arch/sparc/kernel/sun4m_smp.c - 1.17
linux/arch/sparc/kernel/sun4d_smp.c - 1.17
linux/arch/ppc/kernel/smp.c - 1.29
linux/arch/ppc/kernel/setup.c - 1.38
linux/arch/i386/kernel/ptrace.c - 1.18
linux/arch/alpha/kernel/traps.c - 1.18
linux/arch/alpha/kernel/smp.c - 1.28
linux/arch/alpha/kernel/alpha_ksyms.c - 1.29
linux/arch/alpha/config.in - 1.38
linux/Makefile - 1.158
linux/Documentation/Configure.help - 1.119
linux/kernel/ptrace.c - 1.16
linux/arch/alpha/kernel/semaphore.c - 1.6
linux/fs/udf/fsync.c - 1.6
linux/arch/i386/kernel/smpboot.c - 1.24
linux/fs/proc/proc_misc.c - 1.27
linux/drivers/pcmcia/yenta.c - 1.30
linux/arch/ia64/kernel/ptrace.c - 1.14
linux/arch/mips64/sgi-ip27/ip27-init.c - 1.9
linux/arch/alpha/kernel/irq_smp.c - 1.3
linux/drivers/ide/ide-disk.c - 1.17
linux/arch/ia64/kernel/smpboot.c - 1.6
linux/arch/s390/kernel/smp.c - 1.9
linux/kdb/kdbmain.c - 1.24
linux/arch/alpha/vmlinux.lds.in - 1.5
linux/mm/shmem.c - 1.26
linux/fs/reiserfs/Makefile - 1.4
linux/arch/s390x/kernel/smp.c - 1.6
linux/drivers/s390/s390io.c - 1.6
linux/drivers/usb/serial/io_edgeport.c - 1.14
linux/drivers/scsi/aic7xxx_old.c - 1.11
linux/drivers/scsi/aic7xxx/aic7xxx_linux.c - 1.8
linux/arch/mips/kernel/smp.c - 1.2
linux/drivers/usb/usbnet.c - 1.7
linux/arch/ppc/8xx_io/micropatch.c - 1.2
linux/arch/arm/mach-epxa10db/dma.c - 1.2
linux/drivers/atm/idt77252.c - 1.3
linux/drivers/scsi/sym53c8xx_2/sym_glue.h - 1.2
linux/fs/ext3/fsync.c - 1.2
linux/drivers/hotplug/pci_hotplug_core.c - 1.2
|