| To: | Al Viro <viro@xxxxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | [xfs-masters] linux-next: vfs merge conflict |
| From: | Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
| Date: | Thu, 27 Mar 2008 16:26:00 +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,
Today's linux-tree has a small merge conflict between the vfs tree and
commit f5fc8e8dd68da02295c54c99a4b4d08870e50b7a ("[XFS] Fix superblock
features2 field alignment problem") in the XFS tree which I resolved by
leaving the function xfs_sb_has_bad_features2 (introduced in the XFS tree)
in fs/xfs/xfs_sb.h. This is a trivial conflict which I can carry ok.
--
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)
iD8DBQFH6y/tTgG2atn1QN8RAnLGAJ9ZafgzPGTsfK7HidzEqsIURy1p+QCcDc8U
sa4G/Nt/dkcSD3Dnfykeiuc=
=rY34
-----END PGP SIGNATURE-----
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [xfs-masters] [PATCH] fs/xfs - Use #include "xfs.h" not <xfs.h>, Joe Perches |
|---|---|
| Next by Date: | [xfs-masters] linux-next: vfs, xfs merge conflicts, Stephen Rothwell |
| Previous by Thread: | [xfs-masters] [PATCH] fs/xfs - Use #include "xfs.h" not <xfs.h>, Joe Perches |
| Next by Thread: | [xfs-masters] linux-next: vfs, xfs merge conflicts, Stephen Rothwell |
| Indexes: | [Date] [Thread] [Top] [All Lists] |