From: Jeff Garzik <jeff@garzik.org>
To: Lachlan McIlroy <lachlan@sgi.com>
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
xfs@oss.sgi.com, akpm@linux-foundation.org
Subject: Re: [GIT PULL] XFS update for 2.6.25-rc3
Date: Fri, 22 Feb 2008 00:01:18 -0500 [thread overview]
Message-ID: <47BE571E.4000802@garzik.org> (raw)
In-Reply-To: <20080222044209.AD5C558C4C0F@chook.melbourne.sgi.com>
Lachlan McIlroy wrote:
> Remove empty file fs/xfs/Makefile-linux-2.6.
Already in the upstream kernel...
> 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>
next prev parent reply other threads:[~2008-02-22 5:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-22 4:42 [GIT PULL] XFS update for 2.6.25-rc3 Lachlan McIlroy
2008-02-22 5:01 ` Jeff Garzik [this message]
2008-02-22 5:16 ` Lachlan McIlroy
-- strict thread matches above, loose matches on Subject: below --
2008-02-22 4:41 Lachlan McIlroy
2008-02-22 4:48 ` Lachlan McIlroy
2008-02-18 6:27 Lachlan McIlroy
2008-02-18 23:49 ` Linus Torvalds
2008-02-18 23:59 ` Lachlan McIlroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=47BE571E.4000802@garzik.org \
--to=jeff@garzik.org \
--cc=akpm@linux-foundation.org \
--cc=lachlan@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox