Checking out files: 40% (74/182) Checking out files: 41% (HEAD is now at aa7131d [SCSI] ses: add subenclosure support ## # errors /pub/linux/kernel/people/jejb/storage-tree/log-error- ## ## # mail jejb ## ## # master /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 scsi-misc ## Using 2.6.38-stor6 ## # 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/bio.c Auto-merging fs/btrfs/disk-io.c Auto-merging fs/btrfs/extent_io.c Auto-merging fs/btrfs/inode.c Auto-merging fs/direct-io.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/nilfs2/inode.c Auto-merging fs/reiserfs/inode.c Auto-merging fs/super.c CONFLICT (content): Merge conflict in fs/super.c Auto-merging fs/sync.c Auto-merging fs/ubifs/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_aops.c Auto-merging fs/xfs/linux-2.6/xfs_buf.c Auto-merging include/linux/fs.h Auto-merging include/linux/pagemap.h Auto-merging include/linux/sched.h Auto-merging include/linux/swap.h Auto-merging kernel/fork.c Auto-merging kernel/sched.c Auto-merging mm/filemap.c Auto-merging mm/memory-failure.c Auto-merging mm/page-writeback.c Auto-merging mm/shmem.c Auto-merging mm/swapfile.c Auto-merging mm/vmscan.c Automatic merge failed; fix conflicts and then commit the result. ing out files: 98% (179/182) Checking out files: 99% (181/182) Checking out files: 100% (182/182) Checking out files: 100% (182/182), done. From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 6447f55d..4bbba11 master -> origin/master From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 + aa7131d...3703b2c master -> scsi-misc (forced update) Checking out files: 16% (236/1418) Checking out files: 17% (242/1418) Checking out files: 18% (256/1418) Checking out files: 19% (270/1418) Checking out files: 20% (284/1418) Checking out files: 21% (298/1418) Checking out files: 22% (312/1418) Checking out files: 23% (327/1418) Checking out files: 24% (341/1418) Checking out files: 25% (355/1418) Checking out files: 26% (369/1418) Checking out files: 27% (383/1418) Checking out files: 27% (394/1418) Checking out files: 28% (398/1418) Checking out files: 29% (412/1418) Checking out files: 30% (426/1418) Checking out files: 31% (440/1418) Checking out files: 32% (454/1418) Checking out files: 33% (468/1418) Checking out files: 34% (483/1418) Checking out files: 35% (497/1418) Checking out files: 36% (511/1418) Checking out files: 37% (525/1418) Checking out files: 38% (539/1418) Checking out files: 39% (554/1418) Checking out files: 40% (568/1418) Checking out files: 41% (582/1418) Checking out files: 42% (596/1418) Checking out files: 43% (610/1418) Checking out files: 44% (624/1418) Checking out files: 45% (639/1418) Checking out files: 46% (653/1418) Checking out files: 47% (667/1418) Checking out files: 48% (681/1418) Checking out files: 49% (695/1418) Checking out files: 50% (709/1418) Checking out files: 51% (724/1418) Checking out files: 51% (732/1418) Checking out files: 52% (738/1418) Checking out files: 53% (752/1418) Checking out files: 54% (766/1418) Checking out files: 55% (780/1418) Checking out files: 56% (795/1418) Checking out files: 57% (809/1418) Checking out files: 58% (823/1418) Checking out files: 59% (837/1418) Checking out files: 60% (851/1418) Checking out files: 61% (865/1418) Checking out files: 62% (880/1418) Checking out files: 63% (894/1418) Checking out files: 64% (908/1418) Checking out files: 65% (922/1418) Checking out files: 66% (936/1418) Checking out files: 66% (942/1418) Checking out files: 67% (951/1418) Checking out files: 68% (965/1418) Checking out files: 69% (979/1418) Checking out files: 70% (993/1418) Checking out files: 71% (1007/1418) Checking out files: 72% (1021/1418) Checking out files: 73% (1036/1418) Checking out files: 74% (1050/1418) Checking out files: 75% (1064/1418) Checking out files: 76% (1078/1418) Checking out files: 77% (1092/1418) Checking out files: 78% (1107/1418) Checking out files: 79% (1121/1418) Checking out files: 80% (1135/1418) Checking out files: 80% (1137/1418) Checking out files: 81% (1149/1418) Checking out files: 82% (1163/1418) Checking out files: 83% (1177/1418) Checking out files: 84% (1192/1418) Checking out files: 85% (1206/1418) Checking out files: 86% (1220/1418) Checking out files: 87% (1234/1418) Checking out files: 88% (1248/1418) Checking out files: 89% (1263/1418) Checking out files: 90% (1277/1418) Checking out files: 91% (1291/1418) Checking out files: 92% (1305/1418) Checking out files: 93% (1319/1418) Checking out files: 94% (1333/1418) Checking out files: 95% (1348/1418) Checking out files: 95% (1350/1418) Checking out files: 96% (1362/1418) Checking out files: 97% (1376/1418) Checking out files: 98% (1390/1418) Checking out files: 99% (1404/1418) Checking out files: 100% (1418/1418) Checking out files: 100% (1418/1418), done. Switched to branch '2.6.38-stor6' 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 7163849..a83493d for-next -> block-for-next From . * branch block-for-next -> FETCH_HEAD warning: too many files (created: 1005 deleted: 466), skipping inexact rename detection Died at /pub/linux/kernel/people/jejb/build.pl line 103.