Date: Tue Jun 3 12:56:37 PDT 2003
Workarea: chuckle.americas.sgi.com:/go/xfs2/XFS/x2.4-xfs-r1.3
Merged by: cattelan
Merged mods:
2.4.x-xfs:slinx:150093a,2.4.x-xfs:slinx:150096a,2.4.x-xfs:slinx:150097a
2.4.x-xfs:slinx:150122a,2.4.x-xfs:slinx:150137a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs-r1.3
Modid: 2.4.x-xfs-r1.3:slinx:150235a
linux/mm/memory.c - 1.80
linux/kernel/sched.c - 1.51
- Merge of 2.4.x-xfs:slinx:150097a originally by kaos on 05/29/03
Upgrade 2.4.x-xfs to kdb v4.2
linux/kernel/ksyms.c - 1.145
linux/include/asm-ppc/delay.h - 1.7
linux/include/asm-i386/processor.h - 1.35
linux/fs/block_dev.c - 1.36
linux/drivers/video/controlfb.c - 1.20
linux/drivers/char/tty_io.c - 1.43
linux/drivers/block/ll_rw_blk.c - 1.86
linux/arch/i386/kernel/process.c - 1.42
linux/arch/i386/kernel/ioport.c - 1.5
- Merge of 2.4.x-xfs:slinx:150096a originally by kaos on 05/29/03
Upgrade XFS to 2.4.21-rc6
linux/arch/i386/Makefile - 1.26
- Merge of 2.4.x-xfs:slinx:150097a originally by kaos on 05/29/03
Upgrade 2.4.x-xfs to kdb v4.2
linux/Makefile - 1.188
- Merge of 2.4.x-xfs:slinx:150096a originally by kaos on 05/29/03
Upgrade XFS to 2.4.21-rc6
Merge of 2.4.x-xfs:slinx:150097a originally by kaos on 05/29/03
Upgrade 2.4.x-xfs to kdb v4.2
linux/Documentation/Configure.help - 1.146
- Merge of 2.4.x-xfs:slinx:150096a originally by kaos on 05/29/03
Upgrade XFS to 2.4.21-rc6
linux/include/asm-i386/kmap_types.h - 1.7
- Merge of 2.4.x-xfs:slinx:150097a originally by kaos on 05/29/03
Upgrade 2.4.x-xfs to kdb v4.2
linux/include/linux/pci_ids.h - 1.65
linux/drivers/ide/ide.c - 1.41
linux/drivers/ide/ide-dma.c - 1.16
linux/drivers/ide/Config.in - 1.21
- Merge of 2.4.x-xfs:slinx:150096a originally by kaos on 05/29/03
Upgrade XFS to 2.4.21-rc6
linux/fs/xfs/xfs_log_recover.c - 1.269
- Merge of 2.4.x-xfs:slinx:150093a originally by nathans on 05/29/03
V2 log update - tighten checks for corrupt log during recovery
Merge of 2.4.x-xfs:slinx:150122a originally by nathans on 06/01/03
Version 2 log code fixes in recovery.
Several recovery fixes, particularly for version 2 logs. Do a better
job
at sanity checking log headers as we read them in, fix the version
check
for v2 log records, and if the log head==tail do not do any of the
special
case v2 log header buffer-resizing code as doing so is invalid.
linux/fs/xfs/xfs_vfsops.c - 1.420
- Merge of 2.4.x-xfs:slinx:150137a originally by lord on 06/02/03
fix sign of error return in mount update and statfs operations,
mount update could have returned either sign, and statfs was
just wrong.
update parseargs code to return positive errors to be consistent
with other parts of xfs and so the callers can treat it consistently
with the other error values they can get.
linux/fs/xfs/linux/xfs_super.c - 1.258
- Merge of 2.4.x-xfs:slinx:150137a originally by lord on 06/02/03
fix sign of error return in mount update and statfs operations,
mount update could have returned either sign, and statfs was
just wrong.
convert sign of error return before returning to linux
vfs in mntupdate and statfs call.
linux/kdb/kdb_bt.c - 1.16
linux/include/linux/kdbprivate.h - 1.25
linux/include/linux/kdb.h - 1.31
linux/kdb/kdbsupport.c - 1.18
linux/kdb/kdbmain.c - 1.38
linux/include/asm-i386/kdb.h - 1.16
linux/kdb/kdb_io.c - 1.19
linux/Documentation/kdb/kdb_bt.man - 1.11
linux/arch/i386/kdb/kdbasupport.c - 1.26
linux/arch/i386/kdb/kdba_io.c - 1.21
linux/arch/i386/kdb/kdba_bt.c - 1.21
linux/kernel/kallsyms.c - 1.15
linux/kdb/modules/kdbm_pg.c - 1.68
linux/kdb/ChangeLog - 1.30
linux/arch/i386/kdb/ChangeLog - 1.19
- Merge of 2.4.x-xfs:slinx:150097a originally by kaos on 05/29/03
Upgrade 2.4.x-xfs to kdb v4.2
linux/arch/x86_64/ia32/ia32_ioctl.c - 1.4
linux/arch/x86_64/ia32/socket32.c - 1.3
linux/arch/x86_64/kernel/entry.S - 1.3
linux/arch/x86_64/kernel/ioport.c - 1.3
linux/arch/x86_64/lib/csum-copy.S - 1.3
linux/include/asm-x86_64/system.h - 1.3
- Merge of 2.4.x-xfs:slinx:150096a originally by kaos on 05/29/03
Upgrade XFS to 2.4.21-rc6
linux/drivers/usb/host/usb-uhci.c - 1.2
- Merge of 2.4.x-xfs:slinx:150097a originally by kaos on 05/29/03
Upgrade 2.4.x-xfs to kdb v4.2
linux/drivers/ide/ppc/pmac.c - 1.2
linux/drivers/ide/pci/via82cxxx.c - 1.2
linux/drivers/ide/pci/siimage.h - 1.2
linux/drivers/ide/pci/siimage.c - 1.3
linux/drivers/char/ipmi/ipmi_watchdog.c - 1.2
linux/drivers/char/ipmi/ipmi_msghandler.c - 1.2
linux/drivers/char/ipmi/ipmi_kcs_sm.c - 1.2
linux/drivers/char/ipmi/ipmi_kcs_intf.c - 1.2
- Merge of 2.4.x-xfs:slinx:150096a originally by kaos on 05/29/03
Upgrade XFS to 2.4.21-rc6
|