xfs
[Top] [All Lists]

Re: [GIT PULL] XFS update for 2.6.25-rc3

To: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Subject: Re: [GIT PULL] XFS update for 2.6.25-rc3
From: Lachlan McIlroy <lachlan@xxxxxxx>
Date: Tue, 19 Feb 2008 10:59:29 +1100
Cc: linux-kernel@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx
In-reply-to: <alpine.LFD.1.00.0802181547560.7833@woody.linux-foundation.org>
References: <20080218062736.3322E58C4C11@chook.melbourne.sgi.com> <alpine.LFD.1.00.0802181547560.7833@woody.linux-foundation.org>
Reply-to: lachlan@xxxxxxx
Sender: xfs-bounce@xxxxxxxxxxx
User-agent: Thunderbird 2.0.0.9 (X11/20071031)
Linus Torvalds wrote:

On Mon, 18 Feb 2008, Lachlan McIlroy wrote:
This will update the following files:

 fs/xfs/Kbuild             |    6 --
 fs/xfs/Makefile           |  118 ++++++++++++++++++++++++++++++++++++++++++++-
 fs/xfs/Makefile-linux-2.6 |  117 --------------------------------------------
 3 files changed, 117 insertions(+), 124 deletions(-)
 delete mode 100644 fs/xfs/Kbuild

Hmm. This didn't actually remove the old Makefile-linux-2.6 file, so it exists as a zero-length file still.


Was that intentional?
No, not intentional, just the result of a merge failure I didn't clean up.
It shouldn't cause any problems and I'll delete it in the next batch of changes.


Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/



<Prev in Thread] Current Thread [Next in Thread>