From /pub/scm/linux/kernel/git/torvalds/linux-2.6 886c35f..b66e1f1 master -> linus Switched to branch "2.6.25-mc21" remote: Counting objects: 173, done. remote: Compressing objects: 0% (1/120) remote: Compressing objects: 1% (2/120) remote: Compressing objects: 2% (3/120) remote: Compressing obje cremote: ts: 3% (4/120) remote: Compressing objects: 4% (5/120) remAuto-merged block/bsg.c Auto-merged block/scsi_ioctl.c Auto-merged drivers/firewire/fw-sbp2.c Auto-merged drivers/scsi/dpt_i2o.c Auto-merged drivers/scsi/scsi_error.c Auto-merged drivers/scsi/scsi_lib.c Merge made by recursive. Documentation/scsi/ChangeLog.megaraid_sas | 22 + block/bsg.c | 12 +- block/scsi_ioctl.c | 5 +- drivers/firewire/fw-sbp2.c | 2 +- drivers/s390/scsi/zfcp_dbf.c | 2 +- drivers/s390/scsi/zfcp_fsf.c | 2 +- drivers/scsi/53c700.c | 6 +- drivers/scsi/Kconfig | 3 +- drivers/scsi/a100u2w.c | 2 +- drivers/scsi/aacraid/aachba.c | 133 ++++++- drivers/scsi/aacraid/aacraid.h | 28 +- drivers/scsi/aacraid/comminit.c | 2 + drivers/scsi/aacraid/commsup.c | 34 ++- drivers/scsi/aacraid/linit.c | 22 +- drivers/scsi/aic94xx/aic94xx_init.c | 6 +- drivers/scsi/constants.c | 10 +- drivers/scsi/dpt/dpti_ioctl.h | 16 +- drivers/scsi/dpt/dptsig.h | 8 +- drivers/scsi/dpt/sys_info.h | 4 +- drivers/scsi/dpt_i2o.c | 640 ++++++++++++++++++++++------- drivers/scsi/dpti.h | 15 +- drivers/scsi/gdth.c | 2 +- drivers/scsi/hptiop.c | 6 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 7 +- drivers/scsi/ibmvscsi/viosrp.h | 9 + drivers/scsi/initio.c | 2 +- drivers/scsi/ipr.c | 2 +- drivers/scsi/megaraid/megaraid_mbox.c | 17 + drivers/scsi/megaraid/megaraid_mbox.h | 1 + drivers/scsi/megaraid/megaraid_sas.c | 13 +- drivers/scsi/megaraid/megaraid_sas.h | 6 +- drivers/scsi/qla1280.c | 4 +- drivers/scsi/scsi.c | 23 +- drivers/scsi/scsi_error.c | 15 +- drivers/scsi/scsi_lib.c | 7 +- drivers/scsi/scsi_tgt_lib.c | 2 + drivers/scsi/u14-34f.c | 6 +- drivers/usb/storage/cypress_atacb.c | 2 +- drivers/usb/storage/isd200.c | 2 + include/scsi/scsi.h | 40 ++- include/scsi/scsi_cmnd.h | 23 +- include/scsi/scsi_eh.h | 4 +- include/scsi/scsi_host.h | 8 +- 43 files changed, 884 insertions(+), 291 deletions(-) ## # 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 3c3113a: 2.6.25-mc21 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- ## sing objects: 61% (74/120) remote: Compressing objects: 62% (75/120) remote: Compressing objects: 63% (76/120) remote: Compressing objects: 64% (77/120) remote: Compressing objects: 65% (78/120) remote: Compressing objects: 66% (80/120) remote: Compressing objects: 67% (81/120) remote: Compressing objects: 68% (82/120) remote: Compressing objects: 69% (83/120) remote: Compressing objects: 70% (84/120) remote: Compressing objects: 71% (86/120) remote: Compressing objects: 72% (87/120) remote: Compressing objects: 73% (88/120) remote: Compressing objects: 74% (89/120) remote: Compressing objects: 75% (90/120) remote: Compressing objects: 76% (92/120) remote: Compressing objects: 77% (93/120) remote: Compressing objects: 78% (94/120) remote: Compressing objects: 79% (95/120) remote: Compressing objects: 80% (96/120) remote: Compressing objects: 81% (98/120) remote: Compressing objects: 82% (99/120) remote: Compressing objects: 83% (100/120) remote: Compressing objects: 84% (101/120) remote: Compressing objects: 85% (102/120) remote: Compressing objects: 86% (104/120) remote: Compressing objects: 87% (105/120) remote: Compressing objects: 88% (106/120) remote: Compressing objects: 89% (107/120) remote: Compressing objects: 90% (108/120) remote: Compressing objects: 91% (110/120) remote: Compressing objects: 92% (111/120) remote: Compressing objects: 93% (112/120) remote: Compressing objects: 94% (113/120) remote: Compressing objects: 95% (114/120) remote: Compressing objects: 96% (116/120) remote: Compressing objects: 97% (117/120) remote: Compressing objects: 98% (118/120) remote: Compressing objects: 99% (119/120) remote: Compressing objects: 100% (120/120) remote: Compressing objects: 100% (120/120), done. remote: Total 120 (delta 107), reused 0 (delta 0) Receiving objects: 0% (1/120) Receiving objects: 1% (2/120) Receiving objects: 2% (3/120) Receiving objects: 3% (4/120) Receiving objects: 4% (5/120) Receiving objects: 5% (6/120) Receiving objects: 6% (8/120) Receiving objects: 7% (9/120) Receiving objects: 8% (10/120) Receiving objects: 9% (11/120) Receiving objects: 10% (12/120) Receiving objects: 11% (14/120) Receiving objects: 12% (15/120) Receiving objects: 13% (16/120) Receiving objects: 14% (17/120) Receiving objects: 15% (18/120) Receiving objects: 16% (20/120) Receiving objects: 17% (21/120) Receiving objects: 18% (22/120) Receiving objects: 19% (23/120) Receiving objects: 20% (24/120) Receiving objects: 21% (26/120) Receiving objects: 22% (27/120) Receiving objects: 23% (28/120) Receiving objects: 24% (29/120) Receiving objects: 25% (30/120) Receiving objects: 26% (32/120) Receiving objects: 27% (33/120) Receiving objects: 28% (34/120) Receiving objects: 29% (35/120) Receiving objects: 30% (36/120) Receiving objects: 31% (38/120) Receiving objects: 32% (39/120) Receiving objects: 33% (40/120) Receiving objects: 34% (41/120) Receiving objects: 35% (42/120) Receiving objects: 36% (44/120) Receiving objects: 37% (45/120) Receiving objects: 38% (46/120) Receiving objects: 39% (47/120) Receiving objects: 40% (48/120) Receiving objects: 41% (50/120) Receiving objects: 42% (51/120) Receiving objects: 43% (52/120) Receiving objects: 44% (53/120) Receiving objects: 45% (54/120) Receiving objects: 46% (56/120) Receiving objects: 47% (57/120) Receiving objects: 48% (58/120) Receiving objects: 49% (59/120) Receiving objects: 50% (60/120) Receiving objects: 51% (62/120) Receiving objects: 52% (63/120) Receiving objects: 53% (64/120) Receiving objects: 54% (65/120) Receiving objects: 55% (66/120) Receiving objects: 56% (68/120) Receiving objects: 57% (69/120) Receiving objects: 58% (70/120) Receiving objects: 59% (71/120) Receiving objects: 60% (72/120) Receiving objects: 61% (74/120) Receiving objects: 62% (75/120) Receiving objects: 63% (76/120) Receiving objects: 64% (77/120) Receiving objects: 65% (78/120) Receiving objects: 66% (80/120) Receiving objects: 67% (81/120) Receiving objects: 68% (82/120) Receiving objects: 69% (83/120) Receiving objects: 70% (84/120) Receiving objects: 71% (86/120) Receiving objects: 72% (87/120) Receiving objects: 73% (88/120) Receiving objects: 74% (89/120) Receiving objects: 75% (90/120) Receiving objects: 76% (92/120) Receiving objects: 77% (93/120) Receiving objects: 78% (94/120) Receiving objects: 79% (95/120) Receiving objects: 80% (96/120) Receiving objects: 81% (98/120) Receiving objects: 82% (99/120) Receiving objects: 83% (100/120) Receiving objects: 84% (101/120) Receiving objects: 85% (102/120) Receiving objects: 86% (104/120) Receiving objects: 87% (105/120) Receiving objects: 88% (106/120) Receiving objects: 89% (107/120) Receiving objects: 90% (108/120) Receiving objects: 91% (110/120) Receiving objects: 92% (111/120) Receiving objects: 93% (112/120) Receiving objects: 94% (113/120) Receiving objects: 95% (114/120) Receiving objects: 96% (116/120) Receiving objects: 97% (117/120) Receiving objects: 98% (118/120) Receiving objects: 99% (119/120) Receiving objects: 100% (120/120) Receiving objects: 100% (120/120), 22.64 KiB, done. Resolving deltas: 0% (1/107) Resolving deltas: 14% (15/107) Resolving deltas: 15% (17/107) Resolving deltas: 16% (18/107) Resolving deltas: 17% (19/107) Resolving deltas: 29% (32/107) Resolving deltas: 30% (33/107) Resolving deltas: 31% (34/107) Resolving deltas: 32% (35/107) Resolving deltas: 33% (36/107) Resolving deltas: 34% (37/107) Resolving deltas: 35% (38/107) Resolving deltas: 47% (51/107) Resolving deltas: 48% (52/107) Resolving deltas: 49% (53/107) Resolving deltas: 50% (54/107) Resolving deltas: 54% (58/107) Resolving deltas: 55% (59/107) Resolving deltas: 57% (61/107) Resolving deltas: 59% (64/107) Resolving deltas: 61% (66/107) Resolving deltas: 62% (67/107) Resolving deltas: 63% (68/107) Resolving deltas: 64% (69/107) Resolving deltas: 65% (70/107) Resolving deltas: 66% (71/107) Resolving deltas: 67% (72/107) Resolving deltas: 68% (73/107) Resolving deltas: 71% (77/107) Resolving deltas: 74% (80/107) Resolving deltas: 75% (81/107) Resolving deltas: 76% (82/107) Resolving deltas: 77% (83/107) Resolving deltas: 78% (84/107) Resolving deltas: 79% (85/107) Resolving deltas: 80% (86/107) Resolving deltas: 81% (87/107) Resolving deltas: 82% (88/107) Resolving deltas: 83% (89/107) Resolving deltas: 84% (90/107) Resolving deltas: 85% (92/107) Resolving deltas: 86% (93/107) Resolving deltas: 87% (94/107) Resolving deltas: 88% (95/107) Resolving deltas: 89% (96/107) Resolving deltas: 90% (97/107) Resolving deltas: 91% (98/107) Resolving deltas: 93% (100/107) Resolving deltas: 95% (102/107) Resolving deltas: 96% (103/107) Resolving deltas: 98% (105/107) Resolving deltas: 99% (106/107) Resolving deltas: 100% (107/107) Resolving deltas: 100% (107/107), completed with 53 local objects. From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 127ce97..7ad4a48 master -> scsi-misc warning: too many files, skipping inexact rename detection 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.25-mc21"