From /pub/scm/linux/kernel/git/torvalds/linux-2.6 9604006..8f40f67 master -> linus Checking out files: 3% (13/344) Checking out files: 4% (14/344) Checking out files: 5% (18/344) Checking out files: 6% (21/344) Checking out files: 7% (25/344) ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git master scsi-misc ## Removed drivers/md/dm-emc.c Removed drivers/md/dm-hw-handler.c Removed drivers/md/dm-hw-handler.h Removed drivers/md/dm-mpath-hp-sw.c Removed drivers/md/dm-mpath-rdac.c Auto-merged drivers/scsi/Kconfig Merge made by recursive. Documentation/scsi/aacraid.txt | 24 +- drivers/md/Kconfig | 19 +- drivers/md/Makefile | 7 +- drivers/md/dm-emc.c | 345 ------------- drivers/md/dm-hw-handler.c | 213 -------- drivers/md/dm-hw-handler.h | 63 --- drivers/md/dm-mpath-hp-sw.c | 247 ---------- drivers/md/dm-mpath-rdac.c | 700 --------------------------- drivers/md/dm-mpath.c | 161 ++++--- drivers/md/dm-mpath.h | 1 - drivers/s390/scsi/zfcp_aux.c | 8 + drivers/s390/scsi/zfcp_def.h | 20 + drivers/s390/scsi/zfcp_fsf.c | 44 ++ drivers/s390/scsi/zfcp_fsf.h | 11 +- drivers/s390/scsi/zfcp_scsi.c | 65 +++ drivers/scsi/Kconfig | 2 + drivers/scsi/Makefile | 1 + drivers/scsi/device_handler/Kconfig | 32 ++ drivers/scsi/device_handler/Makefile | 7 + drivers/scsi/device_handler/scsi_dh.c | 162 ++++++ drivers/scsi/device_handler/scsi_dh_emc.c | 499 +++++++++++++++++++ drivers/scsi/device_handler/scsi_dh_hp_sw.c | 202 ++++++++ drivers/scsi/device_handler/scsi_dh_rdac.c | 691 ++++++++++++++++++++++++++ drivers/scsi/scsi_error.c | 11 + drivers/scsi/scsi_lib.c | 8 + drivers/scsi/scsi_sysfs.c | 1 + include/scsi/scsi.h | 1 + include/scsi/scsi_device.h | 22 + include/scsi/scsi_dh.h | 59 +++ 29 files changed, 1954 insertions(+), 1672 deletions(-) delete mode 100644 drivers/md/dm-emc.c delete mode 100644 drivers/md/dm-hw-handler.c delete mode 100644 drivers/md/dm-hw-handler.h delete mode 100644 drivers/md/dm-mpath-hp-sw.c delete mode 100644 drivers/md/dm-mpath-rdac.c create mode 100644 drivers/scsi/device_handler/Kconfig create mode 100644 drivers/scsi/device_handler/Makefile create mode 100644 drivers/scsi/device_handler/scsi_dh.c create mode 100644 drivers/scsi/device_handler/scsi_dh_emc.c create mode 100644 drivers/scsi/device_handler/scsi_dh_hp_sw.c create mode 100644 drivers/scsi/device_handler/scsi_dh_rdac.c create mode 100644 include/scsi/scsi_dh.h ## # gitfetch /pub/scm/linux/kernel/git/davem/net-2.6.25.git master net ## BRANCH master not in tree /pub/scm/linux/kernel/git/davem/net-2.6.25.git, SKIPPING ## # merge net resolve /home/jejb/net-resolve.diff ## MERGE net not in tree, SKIPPING ## # check ## Differences exist, continuing ## # label ## Created commit cd86076: 2.6.26-rc2-mc4 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/merge-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/merge-tree/log- ## 90% (310/344) Checking out files: 91% (314/344) Checking out files: 92% (317/344) Checking out files: 93% (320/344) Checking out files: 94% (324/344) Checking out files: 95% (327/344) Checking out files: 96% (331/344) Checking out files: 97% (334/344) Checking out files: 98% (338/344) Checking out files: 98% (340/344) Checking out files: 99% (341/344) Checking out files: 100% (344/344) Checking out files: 100% (344/344), done. Switched to branch "2.6.26-rc2-mc4" fatal: '/pub/scm/linux/kernel/git/davem/net-2.6.25.git': unable to chdir or not a git archive fatal: The remote end hung up unexpectedly error: branch 'net' not found. Already on "2.6.26-rc2-mc4"