From /pub/scm/linux/kernel/git/torvalds/linux-2.6 afa26be..f74d505 master -> linus Checking out files: 17% (7/41) Checking out files: 19% (8/41) Checking out files: 21% (9/41) Checking out files: 24% (10/41) Checking out files: 26% (11/41) Check## # 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 Merge made by recursive. 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/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 +++ 23 files changed, 1788 insertions(+), 1666 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 28ee4b3: 2.6.26-rc1-mc2 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- ## je cremote: ts: 42% (30/70) remote: Compressing objects: 44% (31/70) remote: Compressing objects: 45% (32/70) remote: Compressing objects: 47% (33/70) remote: remote: Compressing objects: 48% (34/70) remote: Compressing objects: 50% (35/70) remote: Compressing objects: 51% (36/70) remote: Compressing o bremote: jects: 52% (37/70) remote: Compressing objects: 54% (38/70) remote: Compressing objects: 55% (39/70) remote: Compressing objects: 57% (40/ 7remote: 0) remote: Compressing objects: 58% (41/70) remote: Compressing objects: 60% (42/70) remote: Compressing objects: 61% (43/70) remote: Compressin gremote: objects: 62% (44/70) remote: Compressing objects: 64% (45/70) remote: Compressing objects: 65% (46/70) remote: Compressing objects: 67% ( 4remote: 7/70) remote: Compressing objects: 68% (48/70) remote: Compressing objects: 70% (49/70) remote: Compressing objects: 71% (50/70) remote: Compres sremote: ing objects: 72% (51/70) remote: Compressing objects: 74% (52/70) remote: Compressing objects: 75% (53/70) remote: Compressing objects: 77 %remote: (54/70) remote: Compressing objects: 78% (55/70) remote: Compressing objects: 80% (56/70) remote: Compressing objects: 81% (57/70) remote: Comp rremote: essing objects: 82% (58/70) remote: Compressing objects: 84% (59/70) remote: Compressing objects: 85% (60/70) remote: Compressing objects: remote: 87% (61/70) remote: Compressing objects: 88% (62/70) remote: Compressing objects: 90% (63/70) remote: Compressing objects: 91% (64/70) remote: C oremote: mpressing objects: 92% (65/70) remote: Compressing objects: 94% (66/70) remote: Compressing objects: 95% (67/70) remote: Compressing object sremote: : 97% (68/70) remote: Compressing objects: 98% (69/70) remote: Compressing objects: 100% (70/70) remote: Compressing objects: 100% (70/70), dremote: one. remote: Total 70 (delta 52), reused 0 (delta 0) From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 7ad4a48..1701c0c master -> scsi-misc 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-rc1-mc2"