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: Re: SCSI trees, merges and git status
Date: Mon, 18 Apr 2005 19:13:14 -0500	[thread overview]
Message-ID: <1113869594.4998.103.camel@mulgrave> (raw)
In-Reply-To: <Pine.LNX.4.58.0504181651241.15725@ppc970.osdl.org>

On Mon, 2005-04-18 at 17:03 -0700, Linus Torvalds wrote:
> The patches from you I have in my tree are:
> 
> 	scsi: add DID_REQUEUE to the error handling
> 	zfcp: add point-2-point support
> 	[PATCH] Convert i2o to compat_ioctl
> 	[PATCH] kill old EH constants
> 	[PATCH] scsi: remove meaningless scsi_cmnd->serial_number_at_timeout field
> 	[PATCH] scsi: remove unused scsi_cmnd->internal_timeout field
> 	[PATCH] remove outdated print_* functions
> 	[PATCH] consolidate timeout defintions in scsi.h

Those are a subset of patches from my scsi-misc-2.6 tree .. that's the
problem.  The actual patches should be:

  o zfcp: convert to compat_ioctl
  o sg.c: update
  o updates for CFQ oops fix
  o finally fix 53c700 to use the generic iomem infrastructure
  o fix NMI lockup with CFQ scheduler

I've redone the scsi-rc-fixes-2.6 tree to remove all the contamination
and reset the head correctly.

I've verified that if I strip your tree back to 

54ff646c589dcc35182d01c5b557806759301aa3

and then do a 

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

Then the git-pull... script actually does the merge and the resulting
tree checks out against BK

Sorry for the screw up.

James


> or at least that's what they claim in their changelogs.
> 
> Oh, and here's the diffstat that matches "scsi":
> 
>  drivers/block/scsi_ioctl.c                 |    5 -
>  drivers/s390/scsi/zfcp_aux.c               |    4 -
>  drivers/s390/scsi/zfcp_def.h               |    5 +
>  drivers/s390/scsi/zfcp_erp.c               |   20 +++++
>  drivers/s390/scsi/zfcp_fsf.c               |   38 ++++++++--
>  drivers/s390/scsi/zfcp_fsf.h               |    6 +
>  drivers/s390/scsi/zfcp_sysfs_adapter.c     |    6 +
>  drivers/scsi/53c7xx.c                      |   23 +++---
>  drivers/scsi/BusLogic.c                    |    7 -
>  drivers/scsi/NCR5380.c                     |    9 +-
>  drivers/scsi/advansys.c                    |    7 -
>  drivers/scsi/aha152x.c                     |   17 ++--
>  drivers/scsi/arm/acornscsi.c               |    9 +-
>  drivers/scsi/arm/fas216.c                  |    9 +-
>  drivers/scsi/arm/scsi.h                    |    2 
>  drivers/scsi/atari_NCR5380.c               |    9 +-
>  drivers/scsi/constants.c                   |    2 
>  drivers/scsi/ips.c                         |    7 -
>  drivers/scsi/ncr53c8xx.c                   |   14 ---
>  drivers/scsi/pci2000.c                     |    4 -
>  drivers/scsi/qla2xxx/qla_dbg.c             |    6 -
>  drivers/scsi/scsi.c                        |    5 -
>  drivers/scsi/scsi.h                        |   43 -----------
>  drivers/scsi/scsi_error.c                  |   11 ---
>  drivers/scsi/scsi_ioctl.c                  |    5 -
>  drivers/scsi/scsi_lib.c                    |    2 
>  drivers/scsi/scsi_obsolete.h               |  106 -----------------------------
>  drivers/scsi/scsi_priv.h                   |    5 -
>  drivers/scsi/seagate.c                     |    5 -
>  drivers/scsi/sg.c                          |    3 
>  drivers/scsi/sun3_NCR5380.c                |    9 +-
>  drivers/scsi/sym53c8xx_2/sym_glue.c        |    6 -
>  drivers/scsi/ultrastor.c                   |    4 -
> 
> so it doesn't look like there's a _lot_ wrong. Send in a patch to revert 
> anything that needs reverting..
> 
> 		Linus
> -
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


  parent reply	other threads:[~2005-04-19  0:13 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
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 [this message]
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=1113869594.4998.103.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.