From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 229aebb..b18cae4 master -> origin/master From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 58ff4bd..8b5919a master -> scsi-misc Checking out files: 1% (8/563) Checking out files: 2% (12/563) Checking out files: 3% (17/563) Chec## # 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/axboe/linux-2.6-block.git for-linus block-for-linus ## Auto-merging block/blk-core.c Merge made by recursive. block/blk-core.c | 24 ++++++++---------------- block/blk-merge.c | 2 +- block/blk.h | 4 ++++ block/genhd.c | 14 -------------- fs/partitions/check.c | 12 ------------ include/linux/blkdev.h | 1 - include/linux/elevator.h | 2 -- include/linux/genhd.h | 1 - 8 files changed, 13 insertions(+), 47 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging fs/ocfs2/file.c CONFLICT (content): Merge conflict in fs/ocfs2/file.c Automatic merge failed; fix conflicts and then commit the result. 22% (124/563) Checking out files: 23% (130/563) Checking out files: 24% (136/563) Checking out files: 25% (141/563) Checking out files: 25% (144/563) Checking out files: 26% (147/563) Checking out files: 27% (153/563) Checking out files: 27% (156/563) Checking out files: 27% (157/563) Checking out files: 28% (158/563) Checking out files: 29% (164/563) Checking out files: 30% (169/563) Checking out files: 30% (173/563) Checking out files: 31% (175/563) Checking out files: 32% (181/563) Checking out files: 33% (186/563) Checking out files: 34% (192/563) Checking out files: 35% (198/563) Checking out files: 36% (203/563) Checking out files: 37% (209/563) Checking out files: 38% (214/563) Checking out files: 39% (220/563) Checking out files: 40% (226/563) Checking out files: 41% (231/563) Checking out files: 42% (237/563) Checking out files: 43% (243/563) Checking out files: 44% (248/563) Checking out files: 45% (254/563) Checking out files: 46% (259/563) Checking out files: 46% (263/563) Checking out files: 47% (265/563) Checking out files: 48% (271/563) Checking out files: 49% (276/563) Checking out files: 50% (282/563) Checking out files: 50% (284/563) Checking out files: 51% (288/563) Checking out files: 51% (290/563) Checking out files: 52% (293/563) Checking out files: 53% (299/563) Checking out files: 54% (305/563) Checking out files: 55% (310/563) Checking out files: 56% (316/563) Checking out files: 56% (319/563) Checking out files: 57% (321/563) Checking out files: 58% (327/563) Checking out files: 59% (333/563) Checking out files: 60% (338/563) Checking out files: 61% (344/563) Checking out files: 61% (349/563) Checking out files: 62% (350/563) Checking out files: 63% (355/563) Checking out files: 64% (361/563) Checking out files: 65% (366/563) Checking out files: 66% (372/563) Checking out files: 66% (374/563) Checking out files: 67% (378/563) Checking out files: 67% (379/563) Checking out files: 68% (383/563) Checking out files: 69% (389/563) Checking out files: 70% (395/563) Checking out files: 71% (400/563) Checking out files: 72% (406/563) Checking out files: 73% (411/563) Checking out files: 74% (417/563) Checking out files: 74% (422/563) Checking out files: 75% (423/563) Checking out files: 75% (424/563) Checking out files: 76% (428/563) Checking out files: 76% (431/563) Checking out files: 77% (434/563) Checking out files: 78% (440/563) Checking out files: 79% (445/563) Checking out files: 79% (450/563) Checking out files: 80% (451/563) Checking out files: 81% (457/563) Checking out files: 82% (462/563) Checking out files: 82% (464/563) Checking out files: 83% (468/563) Checking out files: 84% (473/563) Checking out files: 85% (479/563) Checking out files: 86% (485/563) Checking out files: 86% (486/563) Checking out files: 87% (490/563) Checking out files: 88% (496/563) Checking out files: 89% (502/563) Checking out files: 90% (507/563) Checking out files: 91% (513/563) Checking out files: 91% (517/563) Checking out files: 92% (518/563) Checking out files: 93% (524/563) Checking out files: 93% (527/563) Checking out files: 93% (528/563) Checking out files: 94% (530/563) Checking out files: 95% (535/563) Checking out files: 96% (541/563) Checking out files: 97% (547/563) Checking out files: 98% (552/563) Checking out files: 99% (558/563) Checking out files: 100% (563/563) Checking out files: 100% (563/563), done. Switched to branch '2.6.36-stor1' From . * branch scsi-rc-fixes -> FETCH_HEAD From . * branch block-for-linus -> FETCH_HEAD From . * branch block-for-next -> FETCH_HEAD Died at /pub/linux/kernel/people/jejb/build.pl line 103.