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

[Al Viro <viro@xxxxxxxxxxxxxxxxxx>]

On Mon, Apr 14, 2008 at 05:25:58PM +1000, Stephen Rothwell wrote:
> Hi Al,
> 
> Today's linux-next merge of the vfs tree got a conflict in
> fs/xfs/linux-2.6/xfs_ioctl.c with the xfs tree.  This is because the
> patch "[XFS] The forward declarations for the xfs_ioctl() helpers" is now
> in both trees but both trees have further conflicting changes ("split
> xfs_ioc_xattr" and "r/o bind mounts: elevate write count for ioctls()").
> 
> :-(
> 
> I fixed it up.

Arrrgh...  The best way to deal with that would be to provide harmless stubs
for XFS tree, push the XFS-related piece to xfs.git folks and ask to reorder,
so that both trees would have the duplicate early in queue.  Next to that,
put it in the end of their queue and duplicate it along with prereqs in
vfs-2.6.25 (doesn't require reordering in XFS).  I'd certainly prefer the
former, but if XFS people are of "we never reordering" persuasion... will
have to be the latter, I guess...