Checking out files:  43% (80/184)   
Checking out files:  44% (HEAD is now at 3703b2c [SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module
##
# 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-stor7
##
# 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.
84/184), done.
From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6
   4bbba11..d39dd11  master     -> origin/master
Switched to branch '2.6.38-stor7'
From .
 * branch            scsi-rc-fixes -> FETCH_HEAD
From .
 * branch            block-for-linus -> FETCH_HEAD
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.