Date: Mon Mar 11 22:09:04 PST 2002
Workarea: snort.melbourne.sgi.com:/home/nathans/2.5.x-xfs
Author: nathans
Merged by: nathans
Merged mods: 2.4.x-xfs:slinx:113849a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:113849a
linux/include/linux/quotaops.h - 1.16
linux/include/linux/quota.h - 1.12
linux/include/linux/fs.h - 1.159
linux/include/asm-sparc64/ioctls.h - 1.5
linux/include/asm-sparc/ioctls.h - 1.5
linux/include/asm-m68k/ioctls.h - 1.5
linux/include/asm-i386/ioctls.h - 1.5
linux/include/asm-alpha/ioctls.h - 1.7
linux/fs/ioctl.c - 1.15
linux/fs/dquot.c - 1.53
linux/fs/buffer.c - 1.115
linux/arch/sparc64/kernel/systbls.S - 1.24
linux/arch/sparc64/kernel/sys_sparc32.c - 1.47
linux/include/asm-sh/ioctls.h - 1.6
linux/arch/ia64/ia32/sys_ia32.c - 1.22
linux/include/asm-ia64/ioctls.h - 1.4
linux/include/asm-parisc/ioctls.h - 1.4
linux/arch/s390x/kernel/linux32.c - 1.11
linux/include/asm-cris/ioctls.h - 1.4
linux/fs/Config.help - 1.5
linux/fs/quota.c - 1.8
- Merge of 2.4.x-xfs:slinx:113849a by nathans.
merge in latest quota patches from Jan Kara. minor changes only now.
|