From: Timothy Shimmin <tes@sgi.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: akpm@linux-foundation.org, xfs@oss.sgi.com, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] XFS update
Date: Fri, 20 Jul 2007 10:52:34 +1000 [thread overview]
Message-ID: <46A00752.4040103@sgi.com> (raw)
In-Reply-To: <alpine.LFD.0.999.0707191528250.27249@woody.linux-foundation.org>
Linus Torvalds wrote:
>
> On Fri, 20 Jul 2007, Tim Shimmin wrote:
>> Please pull from the for-linus branch:
>> git pull git://oss.sgi.com:8090/xfs/xfs-2.6.git for-linus
>
> Ok, this got some conflicts with Nick's VM fault patches, but I fixed them
> up since they looked trivial, and pushed out the result. Please do verify
> that it all works and makes sense, though...
>
> Linus
Okay, sorry and thanks.
The window between pulling in and applying changes was obviously
large enough for Nick's changes to get in.
I did pull in, and then had hassles in converting changes between
sgi dev tree and git mainline. Then by the time they were fixed, scripts
updated, had dinner, tree built, had failure with posix_test_lock (fixed that -
then noticed others fixed it - wish I had pulled in at this stage:)
and ran thru some qa, Nick's changes must have gone in.
Ok, next time must remember to repull in latest just before sending out
as a final check.
--Tim
next prev parent reply other threads:[~2007-07-20 0:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-19 14:20 [GIT PULL] XFS update Tim Shimmin
2007-07-19 22:29 ` Linus Torvalds
2007-07-20 0:52 ` Timothy Shimmin [this message]
2007-07-20 1:15 ` Linus Torvalds
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=46A00752.4040103@sgi.com \
--to=tes@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