From: Lachlan McIlroy <lachlan@sgi.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: 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: Tue, 19 Feb 2008 10:59:29 +1100 [thread overview]
Message-ID: <47BA1BE1.4060102@sgi.com> (raw)
In-Reply-To: <alpine.LFD.1.00.0802181547560.7833@woody.linux-foundation.org>
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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
next prev parent reply other threads:[~2008-02-18 23:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-18 6:27 [GIT PULL] XFS update for 2.6.25-rc3 Lachlan McIlroy
2008-02-18 23:49 ` Linus Torvalds
2008-02-18 23:59 ` Lachlan McIlroy [this message]
-- 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-22 4:42 Lachlan McIlroy
2008-02-22 5:01 ` Jeff Garzik
2008-02-22 5:16 ` 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=47BA1BE1.4060102@sgi.com \
--to=lachlan@sgi.com \
--cc=akpm@linux-foundation.org \
--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