On Fri, 15 Feb 2008 17:40:58 +0100 Christoph Hellwig <hch@xxxxxx> 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?
The removal of fs/xfs/Makefile-linux-2.6 conflicts with a change
to this file in Linus' tree since it was last merged into the XFS tree (I
think). See commit 613d70436c1aeda6843ca8b70c7fab6d0484a591. This change
actually appears in both trees.
I don't actually understand why these conflict but there was nothing in
any of the other trees that touch that file. I would have thought git's
merge was smarter than that.
--
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)
iD8DBQFHtms5TgG2atn1QN8RAsamAJ9HddU0tYaHtG/KzVjuIvCU5EY7BwCggfMa
a5Syv+2Tdun3tyhg9udOfhk=
=jRaG
-----END PGP SIGNATURE-----
|