All of lore.kernel.org
 help / color / mirror / Atom feed
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: SCSI trees, merges and git status
Date: Mon, 18 Apr 2005 15:28:38 -0500	[thread overview]
Message-ID: <1113856118.4998.70.camel@mulgrave> (raw)

As of today, I have two SCSI git trees operational:

rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git

and

rsync://www.parisc-linux.org/~jejb/scsi-misc-2.6.git

The latter has a non trivial merge in it because of a conflict in
scsi_device.h, so merges actually do work ...

The trees are exported from BK a changeset at a time (except the merge
bits, which were done manually).  I'll continue to accumulate patches in
the BK trees for the time being since we don't have a nice web browser
interface for the git trees (and also my commit scripts are all BK
based).

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).

James



             reply	other threads:[~2005-04-18 20:28 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-04-18 20:28 James Bottomley [this message]
2005-04-18 21:39 ` SCSI trees, merges and git status Linus Torvalds
2005-04-18 23:14   ` James Bottomley
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=1113856118.4998.70.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.