xfs
[Top] [All Lists]

TAKE 904566 - Tree merge now complete

To: undisclosed-recipients:;
Subject: TAKE 904566 - Tree merge now complete
From: cattelan@xxxxxxxxxxxxxxxxxxxxxx (Russell Cattelan)
Date: Mon, 29 Dec 2003 20:32:41 -0500 (EST)
Sender: linux-xfs-bounce@xxxxxxxxxxx
Final bit of code moving to unify the tree
rename page_buf.c/h to xfs_buf.c/h and merge in upper level xfs_buf.h


Date:  Mon Dec 29 17:31:52 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:163989a
xfs_buf.h - 1.115
        - code merge to linux-2.*/xfs_buf.h

xfs.h - 1.42
        - include changes

support/mrlock.c - 1.17
        - Fix to compile on both 2.4/2.6

support/Makefile - 1.18
        - kmem.c moved to linux-2.4/Makefile

support/kmem.h 1.21 renamed to linux-2.4/kmem.h 1.22
        - support/kmem.h 1.20 Renamed to linux-2.4/kmem.hrenamed

support/kmem.c 1.29 renamed to linux-2.4/kmem.c 1.30
        - support/kmem.c 1.28 Renamed to linux-2.4/kmem.crenamed

Makefile-linux-2.6 - 1.183
        - page_buf.c -> xfs_buf.c

linux-2.6/xfs_linux.h - 1.115
linux-2.4/xfs_linux.h - 1.126
        - include xfs_buf.h 

linux-2.4/Makefile - 1.200
        - page_buf.c -> xfs_buf.c

linux-2.4/page_buf.c 1.149 renamed to linux-2.4/xfs_buf.c 1.150
        - linux-2.4/page_buf.c 1.148 Renamed to linux-2.4/xfs_buf.crename

linux-2.4/page_buf.h 1.84 renamed to linux-2.4/xfs_buf.h 1.85
        - linux-2.4/page_buf.h 1.83 Renamed to linux-2.4/xfs_buf.hrename

linux-2.6/xfs_buf.h - 1.83
        - Merge xfs_buf.h macros

linux-2.6/xfs_buf.c - 1.133
        - include xfs_buf.h 



<Prev in Thread] Current Thread [Next in Thread>
  • TAKE 904566 - Tree merge now complete, Russell Cattelan <=