From: James Bottomley <James.Bottomley@SteelEye.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org, SCSI Mailing List <linux-scsi@vger.kernel.org>
Subject: Re: SCSI trees, merges and git status
Date: Mon, 18 Apr 2005 18:14:51 -0500 [thread overview]
Message-ID: <1113866092.4998.92.camel@mulgrave> (raw)
In-Reply-To: <Pine.LNX.4.58.0504181429570.15725@ppc970.osdl.org>
On Mon, 2005-04-18 at 14:39 -0700, Linus Torvalds wrote:
> > Linus, the rc-fixes repo is ready for applying ... it's the same one I
> > announced on linux-scsi and lkml a while ago just with the git date
> > information updated to be correct (the misc one should wait until after
> > 2.6.12 is final).
>
> Ok. Can you verify? I did a "git diff" between your old head and my new
> head, and it did not show any SCSI files (only the expected arm etc stuff
> that you didn't have in your), so it all _looks_ good. But hey, just to
> make sure that I didn't do anything stupid..
Actually, the verify fails, according to bitkeeper.
It looks like the merge tree has contamination from the scsi-misc-2.6
tree ... possibly because the hosting system got the merged objects when
I pushed.
Could you strip it back and I'll check out the repos on www.parisc-
linux.org?
Thanks,
James
next prev parent reply other threads:[~2005-04-18 23:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-18 20:28 SCSI trees, merges and git status James Bottomley
2005-04-18 21:39 ` Linus Torvalds
2005-04-18 23:14 ` James Bottomley [this message]
2005-04-19 0:03 ` Linus Torvalds
2005-04-19 0:10 ` David Woodhouse
2005-04-19 0:16 ` James Bottomley
2005-04-19 0:41 ` David Woodhouse
2005-04-19 0:13 ` James Bottomley
2005-04-19 0:29 ` Linus Torvalds
2005-04-19 2:17 ` James Bottomley
2005-04-19 3:04 ` Linus Torvalds
2005-04-18 23:23 ` Junio C Hamano
2005-04-18 23:28 ` Petr Baudis
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=1113866092.4998.92.camel@mulgrave \
--to=james.bottomley@steeleye.com \
--cc=git@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=torvalds@osdl.org \
/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;
as well as URLs for NNTP newsgroup(s).