[xfs-masters] Re: linux-next: today's xfs tree did not merge cleanly

[David Chinner <dgc@xxxxxxx>]

On Fri, Feb 15, 2008 at 05:40:58PM +0100, Christoph Hellwig wrote:
> On Fri, Feb 15, 2008 at 05:54:03PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > I have included the conflict diff below.  I fixed up the merge by
> > removing fs/xfs/Makefile-linux-2.6 and using the be32_add_cpu routine
> > (rather than be32_add).
> 
> What tree is the Makefile change coming from?
> 
> Dave, I think it would be useful of the be32_add_cpu changes was
> applied to CVS aswell and rename the own defintions in xfs_arch.h
> to it.  That way we can reduce merge-conflicts a lot.

Yup - I've raised a P1 bug to get the sorted out ASAP. Hopefully
be sorted out later this afternoon...

Cheers,

Dave.
-- 
Dave Chinner
Principal Engineer
SGI Australian Software Group