xfs
[Top] [All Lists]

PARTIAL TAKE 904566 - Merge the the 2.4 and 2.6 trees

To: undisclosed-recipients:;
Subject: PARTIAL TAKE 904566 - Merge the the 2.4 and 2.6 trees
From: cattelan@xxxxxxxxxxxxxxxxxxxxxx (Russell Cattelan)
Date: Mon, 15 Dec 2003 20:06:42 -0500 (EST)
Sender: linux-xfs-bounce@xxxxxxxxxxx
Delete imported files so they can re-named


Date:  Mon Dec 15 16:57:46 PST 2003
Workarea:  naboo.americas.sgi.com:/go/space/XFS/xfs-linux-new

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/xfs-kern/xfs-linux


Modid:  xfs-linux:xfs-kern:163557a
Makefile-linux-2.4 - 1.197
xfs_behavior.c - 1.22
xfs_behavior.h - 1.17
xfs_iomap.c - 1.21
linux-2.4/xfs_lrw.h - 1.40
linux-2.4/xfs_lrw.c - 1.209
linux-2.4/xfs_version.h - 1.170
linux-2.4/xfs_ioctl.c - 1.101
linux-2.4/xfs_vfs.h - 1.47
linux-2.4/xfs_vfs.c - 1.50
linux-2.4/xfs_globals.h - 1.21
linux-2.4/xfs_globals.c - 1.65
linux-2.4/xfs_linux.h - 1.123
linux-2.4/Makefile - 1.197
linux-2.4/page_buf.c - 1.147
linux-2.4/page_buf.h - 1.82
linux-2.4/xfs_file.c - 1.101
linux-2.4/xfs_cred.h - 1.25
linux-2.4/xfs_vnode.c - 1.123
linux-2.4/xfs_vnode.h - 1.89
linux-2.4/xfs_stats.c - 1.17
linux-2.4/xfs_stats.h - 1.11
linux-2.4/xfs_fs_subr.c - 1.41
linux-2.4/xfs_fs_subr.h - 1.14
linux-2.4/xfs_super.h - 1.55
linux-2.4/xfs_super.c - 1.277
linux-2.4/xfs_behavior.c - 1.22
linux-2.4/xfs_behavior.h - 1.17
linux-2.4/xfs_iops.c - 1.202
linux-2.4/xfs_iops.h - 1.26
linux-2.4/xfs_aops.c - 1.63
linux-2.4/xfs_iomap.c - 1.21
linux-2.4/xfs_sysctl.c - 1.32
linux-2.4/xfs_sysctl.h - 1.23

Subject: TAKE 904566 - 

Move the files around to finalize the 2.4/2.6 merge


Date:  Mon Dec 15 17:05:04 PST 2003
Workarea:  naboo.americas.sgi.com:/go/space/XFS/xfs-linux-new

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/xfs-kern/xfs-linux


Modid:  xfs-linux:xfs-kern:163559a
linux/Makefile 1.197 renamed to linux-2.4/Makefile 1.198
        - linux/Makefile 1.196 Renamed to linux-2.4/Makefile

Makefile 1.57 renamed to Makefile-linux-2.4 1.198
        - Makefile 1.56 Renamed to Makefile-linux-2.4

pagebuf/page_buf.c 1.147 renamed to linux-2.4/page_buf.c 1.148
        - pagebuf/page_buf.c 1.146 Renamed to linux-2.4/page_buf.c

pagebuf/page_buf.h 1.82 renamed to linux-2.4/page_buf.h 1.83
        - pagebuf/page_buf.h 1.81 Renamed to linux-2.4/page_buf.h

linux/xfs_lrw.h 1.40 renamed to linux-2.4/xfs_lrw.h 1.41
        - linux/xfs_lrw.h 1.39 Renamed to linux-2.4/xfs_lrw.h

linux/xfs_lrw.c 1.209 renamed to linux-2.4/xfs_lrw.c 1.210
        - linux/xfs_lrw.c 1.208 Renamed to linux-2.4/xfs_lrw.c

linux/xfs_version.h 1.170 renamed to linux-2.4/xfs_version.h 1.171
        - linux/xfs_version.h 1.169 Renamed to linux-2.4/xfs_version.h

linux/xfs_ioctl.c 1.101 renamed to linux-2.4/xfs_ioctl.c 1.102
        - linux/xfs_ioctl.c 1.100 Renamed to linux-2.4/xfs_ioctl.c

linux/xfs_vfs.h 1.47 renamed to linux-2.4/xfs_vfs.h 1.48
        - linux/xfs_vfs.h 1.46 Renamed to linux-2.4/xfs_vfs.h

linux/xfs_vfs.c 1.50 renamed to linux-2.4/xfs_vfs.c 1.51
        - linux/xfs_vfs.c 1.49 Renamed to linux-2.4/xfs_vfs.c

linux/xfs_globals.h 1.21 renamed to linux-2.4/xfs_globals.h 1.22
        - linux/xfs_globals.h 1.20 Renamed to linux-2.4/xfs_globals.h

linux/xfs_globals.c 1.65 renamed to linux-2.4/xfs_globals.c 1.66
        - linux/xfs_globals.c 1.64 Renamed to linux-2.4/xfs_globals.c

linux/xfs_linux.h 1.123 renamed to linux-2.4/xfs_linux.h 1.124
        - linux/xfs_linux.h 1.122 Renamed to linux-2.4/xfs_linux.h

linux/xfs_file.c 1.101 renamed to linux-2.4/xfs_file.c 1.102
        - linux/xfs_file.c 1.100 Renamed to linux-2.4/xfs_file.c

linux/xfs_cred.h 1.25 renamed to linux-2.4/xfs_cred.h 1.26
        - linux/xfs_cred.h 1.24 Renamed to linux-2.4/xfs_cred.h

linux/xfs_vnode.c 1.123 renamed to linux-2.4/xfs_vnode.c 1.124
        - linux/xfs_vnode.c 1.122 Renamed to linux-2.4/xfs_vnode.c

linux/xfs_vnode.h 1.89 renamed to linux-2.4/xfs_vnode.h 1.90
        - linux/xfs_vnode.h 1.88 Renamed to linux-2.4/xfs_vnode.h

linux/xfs_stats.c 1.17 renamed to linux-2.4/xfs_stats.c 1.18
        - linux/xfs_stats.c 1.16 Renamed to linux-2.4/xfs_stats.c

linux/xfs_stats.h 1.11 renamed to linux-2.4/xfs_stats.h 1.12
        - linux/xfs_stats.h 1.10 Renamed to linux-2.4/xfs_stats.h

linux/xfs_fs_subr.c 1.41 renamed to linux-2.4/xfs_fs_subr.c 1.42
        - linux/xfs_fs_subr.c 1.40 Renamed to linux-2.4/xfs_fs_subr.c

linux/xfs_fs_subr.h 1.14 renamed to linux-2.4/xfs_fs_subr.h 1.15
        - linux/xfs_fs_subr.h 1.13 Renamed to linux-2.4/xfs_fs_subr.h

linux/xfs_super.h 1.55 renamed to linux-2.4/xfs_super.h 1.56
        - linux/xfs_super.h 1.54 Renamed to linux-2.4/xfs_super.h

linux/xfs_super.c 1.277 renamed to linux-2.4/xfs_super.c 1.278
        - linux/xfs_super.c 1.276 Renamed to linux-2.4/xfs_super.c

linux/xfs_behavior.c 1.22 renamed to xfs_behavior.c 1.23
        - linux/xfs_behavior.c 1.21 Renamed to xfs_behavior.c

linux/xfs_behavior.h 1.17 renamed to xfs_behavior.h 1.18
        - linux/xfs_behavior.h 1.16 Renamed to xfs_behavior.h

linux/xfs_iops.c 1.202 renamed to linux-2.4/xfs_iops.c 1.203
        - linux/xfs_iops.c 1.201 Renamed to linux-2.4/xfs_iops.c

linux/xfs_iops.h 1.26 renamed to linux-2.4/xfs_iops.h 1.27
        - linux/xfs_iops.h 1.25 Renamed to linux-2.4/xfs_iops.h

linux/xfs_aops.c 1.63 renamed to linux-2.4/xfs_aops.c 1.64
        - linux/xfs_aops.c 1.62 Renamed to linux-2.4/xfs_aops.c

linux/xfs_iomap.c 1.21 renamed to xfs_iomap.c 1.22
        - linux/xfs_iomap.c 1.20 Renamed to xfs_iomap.c

linux/xfs_sysctl.c 1.32 renamed to linux-2.4/xfs_sysctl.c 1.33
        - linux/xfs_sysctl.c 1.31 Renamed to linux-2.4/xfs_sysctl.c

linux/xfs_sysctl.h 1.23 renamed to linux-2.4/xfs_sysctl.h 1.24
        - linux/xfs_sysctl.h 1.22 Renamed to linux-2.4/xfs_sysctl.h



<Prev in Thread] Current Thread [Next in Thread>
  • PARTIAL TAKE 904566 - Merge the the 2.4 and 2.6 trees, Russell Cattelan <=