| To: | xfs-masters@xxxxxxxxxxx |
|---|---|
| Subject: | [xfs-masters] Re: linux-next: today's xfs tree did not merge cleanly |
| From: | Eric Sandeen <sandeen@xxxxxxxxxxx> |
| Date: | Fri, 15 Feb 2008 10:36:12 -0600 |
| Cc: | David Chinner <dgc@xxxxxxx>, linux-next@xxxxxxxxxxxxxxx |
| In-reply-to: | <20080215175403.2bae27cf.sfr@canb.auug.org.au> |
| References: | <20080215175403.2bae27cf.sfr@canb.auug.org.au> |
| Reply-to: | xfs-masters@xxxxxxxxxxx |
| Sender: | xfs-masters-bounce@xxxxxxxxxxx |
| User-agent: | Thunderbird 2.0.0.9 (Macintosh/20071031) |
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). > The Makefile (and the removed Kbuild and Makefile-linux-2.6 files) in the linux-next tree all look correct to me. -Eric |
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [xfs-masters] linux-next: today's xfs tree did not merge cleanly, Stephen Rothwell |
|---|---|
| Next by Date: | [xfs-masters] Re: linux-next: today's xfs tree did not merge cleanly, Christoph Hellwig |
| Previous by Thread: | [xfs-masters] linux-next: today's xfs tree did not merge cleanly, Stephen Rothwell |
| Next by Thread: | [xfs-masters] Re: linux-next: today's xfs tree did not merge cleanly, Christoph Hellwig |
| Indexes: | [Date] [Thread] [Top] [All Lists] |