Date: Mon Jun 16 08:42:12 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:150285a,2.4.x-xfs:slinx:150861a,2.4.x-xfs:slinx:151032a
2.4.x-xfs:slinx:151145a,2.4.x-xfs:slinx:151168a
2.4.x-xfs:slinx:151226a,2.4.x-xfs:slinx:151227a
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:151232a
linux/net/ipv6/tcp_ipv6.c - 1.38
linux/net/ipv6/reassembly.c - 1.13
linux/net/ipv6/af_inet6.c - 1.21
linux/net/ipv4/sysctl_net_ipv4.c - 1.16
linux/net/ipv4/ip_fragment.c - 1.18
linux/net/ipv4/af_inet.c - 1.34
- Merge of 2.4.x-xfs:slinx:150285a originally by kaos on 06/03/03
Upgrade XFS to 2.4.21-rc7
linux/mm/memory.c - 1.81
- Merge of 2.4.x-xfs:slinx:150861a originally by kaos on 06/10/03
Upgrade XFS to 2.4.21-rc8
linux/include/scsi/sg.h - 1.15
linux/include/net/transp_v6.h - 1.3
linux/include/linux/sysctl.h - 1.54
linux/include/asm-sparc64/auxio.h - 1.5
linux/include/asm-sparc/winmacro.h - 1.6
linux/include/asm-sparc/uaccess.h - 1.9
linux/include/asm-sparc/system.h - 1.12
linux/include/asm-sparc/ptrace.h - 1.3
linux/include/asm-sparc/processor.h - 1.19
linux/include/asm-sparc/kgdb.h - 1.3
linux/include/asm-sparc/floppy.h - 1.7
linux/include/asm-sparc/auxio.h - 1.3
- Merge of 2.4.x-xfs:slinx:150285a originally by kaos on 06/03/03
Upgrade XFS to 2.4.21-rc7
linux/fs/ext2/balloc.c - 1.17
- Merge of 2.4.x-xfs:slinx:150861a originally by kaos on 06/10/03
Upgrade XFS to 2.4.21-rc8
linux/drivers/scsi/sg.c - 1.28
linux/drivers/sbus/char/envctrl.c - 1.16
linux/drivers/net/sunlance.c - 1.28
linux/drivers/fc4/socal.c - 1.12
linux/drivers/fc4/soc.c - 1.12
- Merge of 2.4.x-xfs:slinx:150285a originally by kaos on 06/03/03
Upgrade XFS to 2.4.21-rc7
linux/drivers/char/rocket_int.h - 1.4
- Merge of 2.4.x-xfs:slinx:150861a originally by kaos on 06/10/03
Upgrade XFS to 2.4.21-rc8
linux/arch/sparc64/kernel/traps.c - 1.19
linux/arch/sparc64/kernel/sys_sparc32.c - 1.48
linux/arch/sparc64/kernel/sys_sparc.c - 1.25
linux/arch/sparc64/kernel/sparc64_ksyms.c - 1.41
linux/arch/sparc64/kernel/smp.c - 1.38
linux/arch/sparc64/kernel/ioctl32.c - 1.54
linux/arch/sparc64/kernel/entry.S - 1.21
linux/arch/sparc64/kernel/auxio.c - 1.8
linux/arch/sparc/prom/misc.c - 1.4
linux/arch/sparc/mm/sun4c.c - 1.34
linux/arch/sparc/mm/srmmu.c - 1.31
linux/arch/sparc/kernel/wuf.S - 1.5
linux/arch/sparc/kernel/wof.S - 1.5
linux/arch/sparc/kernel/windows.c - 1.5
linux/arch/sparc/kernel/traps.c - 1.10
linux/arch/sparc/kernel/trampoline.S - 1.4
linux/arch/sparc/kernel/sys_sparc.c - 1.15
linux/arch/sparc/kernel/sunos_asm.S - 1.4
linux/arch/sparc/kernel/sparc_ksyms.c - 1.29
linux/arch/sparc/kernel/smp.c - 1.16
linux/arch/sparc/kernel/signal.c - 1.21
linux/arch/sparc/kernel/rtrap.S - 1.9
linux/arch/sparc/kernel/process.c - 1.25
linux/arch/sparc/kernel/head.S - 1.11
linux/arch/sparc/kernel/etrap.S - 1.5
linux/arch/sparc/kernel/entry.S - 1.13
linux/arch/sparc/kernel/auxio.c - 1.5
- Merge of 2.4.x-xfs:slinx:150285a originally by kaos on 06/03/03
Upgrade XFS to 2.4.21-rc7
linux/Makefile - 1.189
- Merge of 2.4.x-xfs:slinx:150285a originally by kaos on 06/03/03
Upgrade XFS to 2.4.21-rc7
Merge of 2.4.x-xfs:slinx:150861a originally by kaos on 06/10/03
Upgrade XFS to 2.4.21-rc8
Merge of 2.4.x-xfs:slinx:151145a originally by lord on 06/13/03
Change version string from 2.4.21-rc8-xfs to 2.4.21-xfs
rc8 became the release
linux/include/linux/iobuf.h - 1.17
- Merge of 2.4.x-xfs:slinx:150861a originally by kaos on 06/10/03
Upgrade XFS to 2.4.21-rc8
linux/arch/sparc64/kernel/power.c - 1.10
linux/include/asm-sh/page.h - 1.12
linux/drivers/net/tokenring/olympic.c - 1.20
- Merge of 2.4.x-xfs:slinx:150285a originally by kaos on 06/03/03
Upgrade XFS to 2.4.21-rc7
linux/fs/xfs/xfs_iocore.c - 1.42
linux/fs/xfs/xfs_mount.h - 1.173
- Merge of 2.4.x-xfs:slinx:151226a originally by lord on 06/16/03
Remove a dead code path from mount, noticed by Al Viro.
drop dev arg from xfs_mountfs
linux/fs/xfs/xfs_mount.c - 1.330
- Merge of 2.4.x-xfs:slinx:151226a originally by lord on 06/16/03
Remove a dead code path from mount, noticed by Al Viro.
drop dev arg from xfs_mountfs, and the noio path which is never
executed.
linux/fs/xfs/linux/xfs_vfs.h - 1.41
- Merge of 2.4.x-xfs:slinx:151227a originally by lord on 06/16/03
SYNC_FSDATA and SYNC_REFCACHE are supposed to be distinct values,
they ended up the same somehow.
make SYNC_FSDATA and SYNC_REFCACHE different
linux/mm/shmem.c - 1.35
- Merge of 2.4.x-xfs:slinx:150861a originally by kaos on 06/10/03
Upgrade XFS to 2.4.21-rc8
linux/drivers/sbus/char/bbc_envctrl.c - 1.2
linux/drivers/sbus/char/bbc_i2c.c - 1.2
linux/arch/sh/kernel/pcibios.c - 1.3
linux/arch/sh/kernel/io_7751se.c - 1.3
- Merge of 2.4.x-xfs:slinx:150285a originally by kaos on 06/03/03
Upgrade XFS to 2.4.21-rc7
linux/fs/xfs/pagebuf/page_buf.c - 1.121
- Merge of 2.4.x-xfs:slinx:151032a originally by lord on 06/12/03
Move the pagebuf_runall_queues out from under a spinlock, if it
sleeps (which it might), this is not the right place for it to
be. There is also no reason for it to be under a spinlock.
move pagebuf_runall_queues out from under the pbd_delwrite_lock
spinlock.
linux/fs/xfs/pagebuf/page_buf_internal.h - 1.23
- Merge of 2.4.x-xfs:slinx:151168a originally by lord on 06/13/03
fix the sysctl & /proc interface for pagebuf so you can turn
tracing on and off again
transpose debug and stats_clear config vars in structure
|