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

[Lachlan McIlroy]

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/
--
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/