TAKE 904196 - Merge up to 2.6.9

[Nathan Scott <nathans@xxxxxxxxxxxxxxxxxxxxxxx>]

Date:  Tue Oct 19 12:35:54 AEST 2004
Workarea:  chook.melbourne.sgi.com:/build/nathans/2.6.x-xfs
Inspected by:  torvalds@xxxxxxxx

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/linux/2.6.x-xfs-melb


Modid:  2.6.x-xfs-melb:linux:19821a
arch/ppc64/kernel/iomap.c - 1.1
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ppc64/kernel/iomap.c
Documentation/scsi/ChangeLog.megaraid - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/Documentation/scsi/ChangeLog.megaraid.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
Makefile - 1.25
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/Makefile.diff?r1=text&tr1=1.25&r2=text&tr2=1.24&f=h
arch/h8300/kernel/ptrace.c - 1.5
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/h8300/kernel/ptrace.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
arch/h8300/lib/checksum.c - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/h8300/lib/checksum.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/h8300/platform/h8300h/generic/timer.c - 1.5
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/h8300/platform/h8300h/generic/timer.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
arch/ia64/kernel/fsys.S - 1.6
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ia64/kernel/fsys.S.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h
arch/ppc/Kconfig - 1.11
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ppc/Kconfig.diff?r1=text&tr1=1.11&r2=text&tr2=1.10&f=h
arch/ppc/kernel/pci.c - 1.8
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ppc/kernel/pci.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
arch/ppc/mm/pgtable.c - 1.7
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ppc/mm/pgtable.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
arch/ppc64/kernel/Makefile - 1.10
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ppc64/kernel/Makefile.diff?r1=text&tr1=1.10&r2=text&tr2=1.9&f=h
arch/ppc64/kernel/eeh.c - 1.9
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ppc64/kernel/eeh.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.8&f=h
arch/ppc64/kernel/smp.c - 1.11
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ppc64/kernel/smp.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.10&f=h
arch/um/Kconfig - 1.5
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/Kconfig.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
arch/um/Kconfig_block - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/Kconfig_block.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/Kconfig_char - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/Kconfig_char.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/Kconfig_net - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/Kconfig_net.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/Makefile - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/Makefile.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/Makefile-i386 - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/Makefile-i386.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/Makefile-skas - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/Makefile-skas.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/Makefile-tt - 1.2
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/Makefile-tt.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
arch/um/drivers/chan_kern.c - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/drivers/chan_kern.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/drivers/ubd_kern.c - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/drivers/ubd_kern.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/include/Makefile - 1.2
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/include/Makefile.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
arch/um/include/sysdep-i386/checksum.h - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/include/sysdep-i386/checksum.h.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/kernel/Makefile - 1.4
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/kernel/Makefile.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
arch/um/kernel/irq.c - 1.6
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/kernel/irq.c.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h
arch/um/kernel/ksyms.c - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/kernel/ksyms.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/kernel/skas/Makefile - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/kernel/skas/Makefile.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/kernel/skas/util/Makefile - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/kernel/skas/util/Makefile.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/kernel/time_kern.c - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/kernel/time_kern.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/kernel/vmlinux.lds.S - 1.2
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/kernel/vmlinux.lds.S.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
arch/um/sys-i386/Makefile - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/sys-i386/Makefile.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/um/sys-i386/util/Makefile - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/sys-i386/util/Makefile.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/x86_64/kernel/suspend_asm.S - 1.5
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/x86_64/kernel/suspend_asm.S.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
drivers/acpi/scan.c - 1.8
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/acpi/scan.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
drivers/base/firmware_class.c - 1.8
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/base/firmware_class.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
drivers/char/agp/intel-agp.c - 1.9
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/char/agp/intel-agp.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.8&f=h
drivers/input/joystick/Kconfig - 1.4
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/input/joystick/Kconfig.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
drivers/input/serio/parkbd.c - 1.5
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/input/serio/parkbd.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
drivers/mtd/chips/cfi_cmdset_0001.c - 1.7
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/mtd/chips/cfi_cmdset_0001.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
drivers/mtd/maps/lubbock-flash.c - 1.6
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/mtd/maps/lubbock-flash.c.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h
drivers/pci/probe.c - 1.13
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/pci/probe.c.diff?r1=text&tr1=1.13&r2=text&tr2=1.12&f=h
drivers/usb/class/usblp.c - 1.9
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/usb/class/usblp.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.8&f=h
drivers/usb/gadget/net2280.c - 1.9
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/usb/gadget/net2280.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.8&f=h
drivers/usb/host/ehci-hcd.c - 1.10
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/usb/host/ehci-hcd.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.9&f=h
drivers/usb/host/ehci.h - 1.9
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/usb/host/ehci.h.diff?r1=text&tr1=1.9&r2=text&tr2=1.8&f=h
drivers/usb/input/hid-core.c - 1.10
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/usb/input/hid-core.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.9&f=h
drivers/usb/media/konicawc.c - 1.5
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/usb/media/konicawc.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
drivers/usb/serial/digi_acceleport.c - 1.5
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/usb/serial/digi_acceleport.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
drivers/video/cyber2000fb.c - 1.4
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/video/cyber2000fb.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
fs/ext3/inode.c - 1.7
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/fs/ext3/inode.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
fs/proc/array.c - 1.7
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/fs/proc/array.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
include/asm-generic/pgtable.h - 1.5
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-generic/pgtable.h.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
include/asm-h8300/bitops.h - 1.6
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-h8300/bitops.h.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h
include/asm-i386/linkage.h - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-i386/linkage.h.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
include/asm-i386/pgtable-3level.h - 1.4
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-i386/pgtable-3level.h.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
include/asm-ppc/io.h - 1.7
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-ppc/io.h.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
include/asm-um/dma-mapping.h - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-um/dma-mapping.h.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
include/asm-um/smp.h - 1.4
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-um/smp.h.diff?r1=text&tr1=1.4&r2=text&tr2=1.3&f=h
include/linux/acct.h - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/linux/acct.h.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
include/linux/highmem.h - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/linux/highmem.h.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
include/linux/linkage.h - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/linux/linkage.h.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
include/linux/sched.h - 1.12
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/linux/sched.h.diff?r1=text&tr1=1.12&r2=text&tr2=1.11&f=h
include/linux/times.h - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/linux/times.h.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
kernel/acct.c - 1.7
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/kernel/acct.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
kernel/exit.c - 1.18
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/kernel/exit.c.diff?r1=text&tr1=1.18&r2=text&tr2=1.17&f=h
kernel/fork.c - 1.10
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/kernel/fork.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.9&f=h
kernel/posix-timers.c - 1.8
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/kernel/posix-timers.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
mm/oom_kill.c - 1.6
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/mm/oom_kill.c.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h
mm/page-writeback.c - 1.8
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/mm/page-writeback.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
mm/vmscan.c - 1.11
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/mm/vmscan.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.10&f=h
net/sunrpc/auth_gss/auth_gss.c - 1.8
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/net/sunrpc/auth_gss/auth_gss.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
net/sunrpc/svcauth.c - 1.5
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/net/sunrpc/svcauth.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.4&f=h
security/selinux/hooks.c - 1.12
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/security/selinux/hooks.c.diff?r1=text&tr1=1.12&r2=text&tr2=1.11&f=h
arch/ppc64/mm/hash_low.S - 1.8
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ppc64/mm/hash_low.S.diff?r1=text&tr1=1.8&r2=text&tr2=1.7&f=h
drivers/pci/hotplug/rpaphp_pci.c - 1.7
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/pci/hotplug/rpaphp_pci.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.6&f=h
drivers/scsi/megaraid/megaraid_mbox.h - 1.2
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/scsi/megaraid/megaraid_mbox.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
include/asm-m32r/unistd.h - 1.2
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/include/asm-m32r/unistd.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
drivers/scsi/megaraid/megaraid_mbox.c - 1.2
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/drivers/scsi/megaraid/megaraid_mbox.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
arch/um/kernel/physmem.c - 1.2
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/um/kernel/physmem.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
arch/ppc64/kernel/prom_init.c - 1.2
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/ppc64/kernel/prom_init.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h
arch/m32r/kernel/entry.S - 1.3
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/m32r/kernel/entry.S.diff?r1=text&tr1=1.3&r2=text&tr2=1.2&f=h
arch/m32r/kernel/sys_m32r.c - 1.2
http://oss.sgi.com/cgi-bin/cvsweb.cgi/linux-2.6-xfs/arch/m32r/kernel/sys_m32r.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.1&f=h