| To: | xfs-masters@xxxxxxxxxxx |
|---|---|
| Subject: | [xfs-masters] Re: linux-next: today's xfs tree did not merge cleanly |
| From: | Christoph Hellwig <hch@xxxxxx> |
| Date: | Fri, 15 Feb 2008 17:40:58 +0100 |
| Cc: | David Chinner <dgc@xxxxxxx>, linux-next@xxxxxxxxxxxxxxx |
| In-reply-to: | <20080215175403.2bae27cf.sfr@xxxxxxxxxxxxxxxx> |
| References: | <20080215175403.2bae27cf.sfr@xxxxxxxxxxxxxxxx> |
| Reply-to: | xfs-masters@xxxxxxxxxxx |
| Sender: | xfs-masters-bounce@xxxxxxxxxxx |
| User-agent: | Mutt/1.3.28i |
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. |
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [xfs-masters] Re: linux-next: today's xfs tree did not merge cleanly, Eric Sandeen |
|---|---|
| Next by Date: | [xfs-masters] [Bug 776] XFS hangs in SMP x86_64 kernel after many file creates, bugzilla-daemon |
| Previous by Thread: | [xfs-masters] Re: linux-next: today's xfs tree did not merge cleanly, Eric Sandeen |
| Next by Thread: | [xfs-masters] Re: linux-next: today's xfs tree did not merge cleanly, Stephen Rothwell |
| Indexes: | [Date] [Thread] [Top] [All Lists] |