From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 151f52f..814ce25 master -> origin/master From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 592488a..151f52f master -> scsi-misc Checking out files: 21% (211/969) Checking out files: 22% (214/969) Checking out files: 23% (223/969) ## # 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 ## Updating 151f52f..4429838 Fast-forward block/blk-core.c | 4 ++-- block/blk-map.c | 2 ++ block/compat_ioctl.c | 4 ++-- block/ioctl.c | 7 ++++--- block/scsi_ioctl.c | 34 ++++++++++++++++++++++++---------- drivers/block/cciss.c | 3 ++- drivers/block/drbd/drbd_int.h | 2 +- drivers/md/md.c | 20 ++++++++++---------- fs/bio.c | 9 ++++++++- fs/ioprio.c | 4 ++++ 10 files changed, 59 insertions(+), 30 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. s: 48% (466/969) Checking out files: 48% (472/969) Checking out files: 49% (475/969) Checking out files: 50% (485/969) Checking out files: 51% (495/969) Checking out files: 52% (504/969) Checking out files: 53% (514/969) Checking out files: 53% (519/969) Checking out files: 54% (524/969) Checking out files: 55% (533/969) Checking out files: 56% (543/969) Checking out files: 57% (553/969) Checking out files: 58% (563/969) Checking out files: 59% (572/969) Checking out files: 59% (581/969) Checking out files: 60% (582/969) Checking out files: 61% (592/969) Checking out files: 62% (601/969) Checking out files: 63% (611/969) Checking out files: 64% (621/969) Checking out files: 64% (625/969) Checking out files: 65% (630/969) Checking out files: 66% (640/969) Checking out files: 67% (650/969) Checking out files: 68% (659/969) Checking out files: 69% (669/969) Checking out files: 69% (675/969) Checking out files: 70% (679/969) Checking out files: 71% (688/969) Checking out files: 72% (698/969) Checking out files: 72% (707/969) Checking out files: 73% (708/969) Checking out files: 74% (718/969) Checking out files: 75% (727/969) Checking out files: 76% (737/969) Checking out files: 76% (745/969) Checking out files: 77% (747/969) Checking out files: 78% (756/969) Checking out files: 79% (766/969) Checking out files: 80% (776/969) Checking out files: 81% (785/969) Checking out files: 81% (786/969) Checking out files: 82% (795/969) Checking out files: 83% (805/969) Checking out files: 84% (814/969) Checking out files: 85% (824/969) Checking out files: 86% (834/969) Checking out files: 86% (842/969) Checking out files: 87% (844/969) Checking out files: 88% (853/969) Checking out files: 89% (863/969) Checking out files: 90% (873/969) Checking out files: 91% (882/969) Checking out files: 91% (888/969) Checking out files: 92% (892/969) Checking out files: 93% (902/969) Checking out files: 94% (911/969) Checking out files: 95% (921/969) Checking out files: 95% (929/969) Checking out files: 96% (931/969) Checking out files: 97% (940/969) Checking out files: 98% (950/969) Checking out files: 99% (960/969) Checking out files: 99% (963/969) Checking out files: 100% (969/969) Checking out files: 100% (969/969), done. Switched to branch '2.6.37-rc1-stor1' From /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 4789716..151f52f master -> scsi-rc-fixes From . * branch scsi-rc-fixes -> FETCH_HEAD From /pub/scm/linux/kernel/git/axboe/linux-2.6-block + 1167cb4...4429838 for-linus -> block-for-linus (forced update) From . * branch block-for-linus -> FETCH_HEAD From . * branch block-for-next -> FETCH_HEAD warning: too many files (created: 1642 deleted: 802), skipping inexact rename detection Died at /pub/linux/kernel/people/jejb/build.pl line 103.