From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 08351fc..9975961 master -> origin/master From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 bc898c9..0a95d92 master -> scsi-misc Checking out files: 7% (431/5868) Checking out files: 8% (470/5868) Checking out files: 8% (526/586## # 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 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging block/blk-core.c Auto-merging block/blk-lib.c Auto-merging drivers/block/amiflop.c Auto-merging drivers/block/drbd/drbd_nl.c Auto-merging drivers/block/xsysace.c Auto-merging drivers/md/md.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/staging/hv/blkvsc_drv.c Auto-merging drivers/target/target_core_iblock.c Auto-merging fs/adfs/inode.c Auto-merging fs/aio.c CONFLICT (content): Merge conflict in fs/aio.c Auto-merging fs/btrfs/extent_io.c Auto-merging fs/btrfs/inode.c Auto-merging fs/fat/inode.c Auto-merging fs/fuse/inode.c Auto-merging fs/gfs2/aops.c Auto-merging fs/gfs2/log.c Auto-merging fs/gfs2/lops.c Auto-merging fs/gfs2/meta_io.c Auto-merging fs/hpfs/file.c Auto-merging fs/reiserfs/inode.c Auto-merging fs/super.c Auto-merging fs/udf/file.c Auto-merging fs/udf/inode.c Auto-merging fs/ufs/inode.c Auto-merging fs/ufs/truncate.c Auto-merging fs/xfs/linux-2.6/xfs_buf.c Auto-merging include/linux/fs.h Auto-merging include/linux/sched.h Auto-merging kernel/fork.c Auto-merging kernel/sched.c Auto-merging mm/memory-failure.c Auto-merging mm/shmem.c Automatic merge failed; fix conflicts and then commit the result. (1878/5868) Checking out files: 32% (1896/5868) Checking out files: 33% (1937/5868) Checking out files: 33% (1981/5868) Checking out files: 34% (1996/5868) Checking out files: 35% (2054/5868) Checking out files: 35% (2082/5868) Checking out files: 36% (2113/5868) Checking out files: 37% (2172/5868) Checking out files: 37% (2204/5868) Checking out files: 38% (2230/5868) Checking out files: 39% (2289/5868) Checking out files: 40% (2348/5868) Checking out files: 41% (2406/5868) Checking out files: 42% (2465/5868) Checking out files: 42% (2475/5868) Checking out files: 43% (2524/5868) Checking out files: 44% (2582/5868) Checking out files: 45% (2641/5868) Checking out files: 46% (2700/5868) Checking out files: 46% (2737/5868) Checking out files: 47% (2758/5868) Checking out files: 48% (2817/5868) Checking out files: 49% (2876/5868) Checking out files: 50% (2934/5868) Checking out files: 51% (2993/5868) Checking out files: 52% (3052/5868) Checking out files: 53% (3111/5868) Checking out files: 54% (3169/5868) Checking out files: 55% (3228/5868) Checking out files: 55% (3283/5868) Checking out files: 56% (3287/5868) Checking out files: 57% (3345/5868) Checking out files: 58% (3404/5868) Checking out files: 59% (3463/5868) Checking out files: 60% (3521/5868) Checking out files: 60% (3555/5868) Checking out files: 61% (3580/5868) Checking out files: 62% (3639/5868) Checking out files: 63% (3697/5868) Checking out files: 64% (3756/5868) Checking out files: 65% (3815/5868) Checking out files: 66% (3873/5868) Checking out files: 67% (3932/5868) Checking out files: 68% (3991/5868) Checking out files: 68% (4048/5868) Checking out files: 69% (4049/5868) Checking out files: 70% (4108/5868) Checking out files: 71% (4167/5868) Checking out files: 72% (4225/5868) Checking out files: 73% (4284/5868) Checking out files: 74% (4343/5868) Checking out files: 75% (4401/5868) Checking out files: 75% (4411/5868) Checking out files: 76% (4460/5868) Checking out files: 77% (4519/5868) Checking out files: 78% (4578/5868) Checking out files: 78% (4600/5868) Checking out files: 79% (4636/5868) Checking out files: 80% (4695/5868) Checking out files: 81% (4754/5868) Checking out files: 81% (4775/5868) Checking out files: 82% (4812/5868) Checking out files: 83% (4871/5868) Checking out files: 84% (4930/5868) Checking out files: 85% (4988/5868) Checking out files: 86% (5047/5868) Checking out files: 86% (5089/5868) Checking out files: 87% (5106/5868) Checking out files: 88% (5164/5868) Checking out files: 89% (5223/5868) Checking out files: 89% (5260/5868) Checking out files: 90% (5282/5868) Checking out files: 91% (5340/5868) Checking out files: 92% (5399/5868) Checking out files: 93% (5458/5868) Checking out files: 93% (5459/5868) Checking out files: 94% (5516/5868) Checking out files: 95% (5575/5868) Checking out files: 95% (5576/5868) Checking out files: 96% (5634/5868) Checking out files: 97% (5692/5868) Checking out files: 98% (5751/5868) Checking out files: 98% (5786/5868) Checking out files: 99% (5810/5868) Checking out files: 100% (5868/5868) Checking out files: 100% (5868/5868), done. Switched to branch '2.6.38-stor1' From . * branch scsi-rc-fixes -> FETCH_HEAD From . * branch block-for-linus -> FETCH_HEAD From /pub/scm/linux/kernel/git/axboe/linux-2.6-block ecbcdb2..8f6691c for-next -> block-for-next From . * branch block-for-next -> FETCH_HEAD warning: too many files (created: 866 deleted: 442), skipping inexact rename detection Died at /pub/linux/kernel/people/jejb/build.pl line 103.