xfs-masters
[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[xfs-masters] linux-next: vfs, xfs merge conflicts

from [Stephen Rothwell] [Permanent Link][Original]
To: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Subject: [xfs-masters] linux-next: vfs, xfs merge conflicts
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 28 Mar 2008 16:19:54 +1100
Cc: David Chinner <dgc@xxxxxxx>, xfs-masters@xxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx
Reply-to: xfs-masters@xxxxxxxxxxx
Sender: xfs-masters-bounce@xxxxxxxxxxx 
Hi Al, David,
The number of conflicts is slowly growing. Today I got conflicts on

fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_ialloc.c
fs/xfs/xfs_sb.h

I have fixed them up for now.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

-- Attached file included as plaintext by Ecartis --

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFH7H/+TgG2atn1QN8RAjfjAJwI1I+uMY26Y3387Ephyz6AWyy41QCeO6t5
D+rIS9A8Q45jvMURUEdwCyA=
=O28a
-----END PGP SIGNATURE-----
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [xfs-masters] linux-next: vfs, xfs merge conflicts, Stephen Rothwell <=
Previous by Date:  [xfs-masters] linux-next: vfs merge conflict, Stephen Rothwell
Next by Date:  [xfs-masters] [Bug 778] Possible bug in 2.6.25 xfs xfs_ilock code?, bugzilla-daemon
Previous by Thread:  [xfs-masters] linux-next: vfs merge conflict, Stephen Rothwell
Next by Thread:  [xfs-masters] [Bug 778] Possible bug in 2.6.25 xfs xfs_ilock code?, bugzilla-daemon
Indexes:  [Date] [Thread] [Top] [All Lists]