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

Lachlan McIlroy
2008-02-22T05:11:11Z

Jeff Garzik wrote:
> Lachlan McIlroy wrote:
>> Remove empty file fs/xfs/Makefile-linux-2.6.
>
> Already in the upstream kernel...
That's funny - I didn't see this change come through. Oh well... thanks.

>
>
>> commit 1803f3389b7ac9ed33ea561b3b94e22e2864a95d
>> Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
>> Date: Wed Feb 20 19:55:09 2008 -0800
>>
>> Remove empty file remnants that were left in the tree by mistake
>> Noted by various people (Sam, Jeff, Roland..)
>> Commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2 intended to
>> remove the
>> xfs "Makefile-linux-2.6" file, but it was mistakenly still left in
>> the
>> tree as a empty file, and would cause git to correctly complain
>> about a
>> tracked file being removed after a "make distclean" (which removes
>> empty
>> files as garbage).
>> And the asm-x86/desc_64.h file was supposed to be removed by
>> commit
>> c81c6ca45a69478c7877b729af1942d2b80ef582, but instead stayed around
>> containing just a single newline.
>> Get rid of them both properly.
>> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>