xfs-masters
[Top] [All Lists]

[xfs-masters] linux-next: vfs merge failure

To: Al Viro <viro@xxxxxxxxxxxxxxxxxx>, Dave Hansen <haveblue@xxxxxxxxxx>
Subject: [xfs-masters] linux-next: vfs merge failure
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 26 Mar 2008 16:06:51 +1100
Cc: David Chinner <dgc@xxxxxxx>, xfs-masters@xxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx
Reply-to: xfs-masters@xxxxxxxxxxx
Sender: xfs-masters-bounce@xxxxxxxxxxx
Hi Al, Dave,
In merging your vfs tree today, I get a conflict between commit
9e57c9b50551a21e056fea654b3aac5db7c33ec9 ("[PATCH] r/o bind mounts:
elevate write count for ioctls()") and commit
c657925dc0057ed2ec0db845a1a4f56651adfe39 ("[XFS] The forward declarations
for the xfs_ioctl() helpers and the") in the xfs tree.  Basically the
whole xfs_ioctl function has been moved by the latter commit while Dave's
patch modifies it slightly.

I have fixed it up for today and am not really sure what we can do about
it (hopefully git-rerere will fix it for me from now on, so I can carry
it, but it will conflict when merged into Linus' tree).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

-- Attached file included as plaintext by Ecartis --

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

iD8DBQFH6dnzTgG2atn1QN8RAiNeAJ4snPC5q9zwaEjemda3Rx60rkUDJQCbBwDw
vgV6rzNxirGwOYyI88fHzhE=
=ZaRM
-----END PGP SIGNATURE-----



<Prev in Thread] Current Thread [Next in Thread>