Re: SCSI trees, merges and git status

[James Bottomley <James.Bottomley@SteelEye.com>]

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