On Mon, 18 Apr 2005, James Bottomley wrote: > > 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. Nope, the way I merge, if I get a few objects it shouldn't matter at all. I'll just look at your HEAD, and merge with the objects that represents. Afterwards, if I have extra objects, I'll see them with fsck-cache. > Could you strip it back and I'll check out the repos on www.parisc- > linux.org? Git does work like BK in the way that you cannot remove history when you have distributed it. Once it's there, it's there. 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 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 - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
