xfs
[Top] [All Lists]

TAKE - 2.5 modmerging

To: linux-xfs@xxxxxxxxxxx
Subject: TAKE - 2.5 modmerging
From: Nathan Scott <nathans@xxxxxxxxxxxxxxxxxxxxxxx>
Date: Thu, 30 May 2002 11:03:35 +1000 (EST)
Sender: owner-linux-xfs@xxxxxxxxxxx
Couple of mods which had been checked into 2.4, now merged into 2.5 tree.


Date:  Wed May 29 16:51:52 PDT 2002
Workarea:  snort.melbourne.sgi.com:/home/nathans/linux-xfs
Author:  nathans
Merged by:  nathans
Merged mods:  2.4.x-xfs:slinx:120407a

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs


Modid:  2.5.x-xfs:slinx:120407a
linux/include/linux/dqblk_xfs.h - 1.1
        - Merge of 2.4.x-xfs:slinx:120407a by nathans.
          dq info for XFS filesystems, consistent with other quota headers.

linux/include/linux/quota.h - 1.16
linux/include/linux/xqm.h 1.10 renamed to linux/include/linux/quotaio_xfs.h 1.1
        - Merge of 2.4.x-xfs:slinx:120407a by nathans.
          tweak the names of XFS includes for cleaner XFS integration.

linux/fs/Config.in - 1.89
        - Merge of 2.4.x-xfs:slinx:120407a by nathans.
          add CONFIG_QUOTACTL if CONFIG_XFS_QUOTA set, preparing the way for
          next set of quota patches to apply cleanly to XFS.


Date:  Wed May 29 18:00:48 PDT 2002
Workarea:  snort.melbourne.sgi.com:/home/nathans/linux-xfs
Author:  lord
Merged by:  nathans
Merged mods:  2.4.x-xfs:slinx:120205a

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs


Modid:  2.5.x-xfs:slinx:120205a
linux/fs/xfs/xfs_vfsops.c - 1.348
linux/include/linux/behavior.h - 1.2
linux/fs/xfs/linux/xfs_vfs.h - 1.12
linux/fs/xfs/linux/xfs_behavior.h - 1.3
        - Merge of 2.4.x-xfs:slinx:120205a by nathans.
          kill some dead behavior code



<Prev in Thread] Current Thread [Next in Thread>
  • TAKE - 2.5 modmerging, Nathan Scott <=