# < git ls-remote /scratch/git/sfr/linux-next refs/heads/master
# < git rev-parse tmp/linux-next
remote == local, skipping fetch
# < git rev-parse tmp/linux-next
Upstream revision is f55f020329dc0c52ff843cb53f4c861cbf2db921
Head not built, building
# < git reset --mixed
# git branch -D linux-next
Deleted branch linux-next (was f55f020).
# git checkout -q -f -b linux-next tmp/linux-next
# < git ls-files --others --modified
# git ls-files --others --modified
cmd.log
# < /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linux-next_um-defconfig_um-i386 CROSS_COMPILE=/opt/crosstool/gcc-4.2.3-glibc-2.3.6/i386-unknown-linux-gnu/bin/i386-unknown-linux-gnu- SUBARCH=i386 -f kisskb-version.mk
makewrap: Added ccache to CROSS_COMPILE
makewrap: Using -j factor 32
# < /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linux-next_um-defconfig_um-i386 CROSS_COMPILE=/opt/crosstool/gcc-4.2.3-glibc-2.3.6/i386-unknown-linux-gnu/bin/i386-unknown-linux-gnu- SUBARCH=i386 defconfig
makewrap: Added ccache to CROSS_COMPILE
makewrap: Using -j factor 32
# /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linux-next_um-defconfig_um-i386 CROSS_COMPILE=/opt/crosstool/gcc-4.2.3-glibc-2.3.6/i386-unknown-linux-gnu/bin/i386-unknown-linux-gnu- SUBARCH=i386 
makewrap: Added ccache to CROSS_COMPILE
makewrap: Using -j factor 32
  GEN     /scratch/kisskb/build/linux-next_um-defconfig_um-i386/Makefile
scripts/kconfig/conf --silentoldconfig arch/um/Kconfig.x86
  CC      arch/um/sys-i386/user-offsets.s
  GEN     /scratch/kisskb/build/linux-next_um-defconfig_um-i386/Makefile
  CHK     include/linux/version.h
  UPD     include/linux/version.h
  CHK     arch/um/include/shared/user_constants.h
  UPD     arch/um/include/shared/user_constants.h
  HOSTCC  scripts/kallsyms
  HOSTCC  scripts/bin2c
  CC      scripts/mod/empty.o
  HOSTCC  scripts/mod/mk_elfconfig
  MKELF   scripts/mod/elfconfig.h
  HOSTCC  scripts/mod/file2alias.o
  HOSTCC  scripts/mod/modpost.o
  HOSTCC  scripts/mod/sumversion.o
  HOSTLD  scripts/mod/modpost
  Using /scratch/kisskb/src as source for kernel
  CHK     include/generated/utsrelease.h
  UPD     include/generated/utsrelease.h
  CC      kernel/bounds.s
  GEN     include/generated/bounds.h
  CC      arch/um/kernel/asm-offsets.s
  GEN     include/generated/asm-offsets.h
  CALL    /scratch/kisskb/src/scripts/checksyscalls.sh
  CHK     include/generated/compile.h
  CC      init/main.o
  LD      usr/built-in.o
  CC      init/do_mounts.o
  CC      init/noinitramfs.o
  CC      init/calibrate.o
  QUOTE   arch/um/kernel/config.tmp
  CC      arch/um/kernel/exec.o
  CC      arch/um/kernel/exitcode.o
  CC      arch/um/kernel/init_task.o
  CC      arch/um/kernel/irq.o
  CC      arch/um/kernel/ksyms.o
  CC      arch/um/kernel/mem.o
  UPD     include/generated/compile.h
  CC      arch/um/os-Linux/aio.o
  CC      arch/um/kernel/physmem.o
  CC      arch/um/os-Linux/elf_aux.o
  CC      arch/um/os-Linux/execvp.o
  CC      arch/um/kernel/process.o
  LD      arch/x86/crypto/built-in.o
  CC      arch/um/os-Linux/file.o
  CC      arch/um/kernel/ptrace.o
  CC      arch/um/kernel/reboot.o
  CC      arch/um/os-Linux/helper.o
  CC      arch/um/sys-i386/bug.o
  CC      arch/um/os-Linux/irq.o
  CC      arch/um/sys-i386/bugs.o
  CC      init/version.o
  CC      arch/um/os-Linux/main.o
  CC      arch/um/os-Linux/mem.o
  CC      arch/um/os-Linux/process.o
  CC      arch/um/kernel/sigio.o
  AS      arch/um/sys-i386/checksum.o
  CC      kernel/sched.o
  CC      arch/um/os-Linux/registers.o
  CC      mm/bootmem.o
  CC      mm/filemap.o
  CC      arch/um/drivers/stdio_console.o
  CC      arch/um/drivers/fd.o
  CC      mm/mempool.o
  CC      arch/um/os-Linux/sigio.o
In file included from /scratch/kisskb/src/include/linux/dmaengine.h:26,
                 from /scratch/kisskb/src/include/linux/skbuff.h:30,
                 from /scratch/kisskb/src/include/linux/icmpv6.h:82,
                 from /scratch/kisskb/src/include/linux/ipv6.h:220,
                 from /scratch/kisskb/src/include/net/ipv6.h:16,
                 from /scratch/kisskb/src/include/linux/sunrpc/clnt.h:25,
                 from /scratch/kisskb/src/include/linux/nfs_fs.h:48,
                 from /scratch/kisskb/src/init/do_mounts.c:20:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  CC      ipc/util.o
  CC      arch/um/kernel/signal.o
  CC      arch/um/kernel/smp.o
  CC      fs/open.o
  CC      arch/um/sys-i386/delay.o
  CC      arch/um/drivers/chan_kern.o
  CC      fs/read_write.o
In file included from /scratch/kisskb/src/include/linux/dmaengine.h:26,
                 from /scratch/kisskb/src/include/linux/skbuff.h:30,
                 from /scratch/kisskb/src/include/linux/netfilter.h:6,
                 from /scratch/kisskb/src/include/net/netns/x_tables.h:5,
                 from /scratch/kisskb/src/include/net/net_namespace.h:18,
                 from /scratch/kisskb/src/include/linux/init_task.h:13,
                 from /scratch/kisskb/src/arch/um/kernel/init_task.c:7:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  CC      fs/file_table.o
  CC      arch/um/sys-i386/fault.o
  CC      kernel/fork.o
  CC      arch/um/drivers/chan_user.o
make[2]: *** [arch/um/kernel/init_task.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      ipc/msgutil.o
make[2]: *** [init/do_mounts.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      arch/um/sys-i386/ksyms.o
  CC      arch/um/drivers/line.o
  CC      ipc/msg.o
  CC      arch/um/drivers/ssl.o
  CC      kernel/exec_domain.o
  CC      arch/um/sys-i386/ldt.o
  CC      ipc/sem.o
  CC      arch/um/drivers/stderr_console.o
  CC      kernel/panic.o
  CC      kernel/printk.o
make[1]: *** [arch/um/kernel] Error 2
make[1]: *** Waiting for unfinished jobs....
  CC      kernel/cpu.o
  CC      arch/um/os-Linux/signal.o
  CC      arch/um/sys-i386/ptrace.o
  CC      arch/um/os-Linux/start_up.o
  CC      arch/um/sys-i386/ptrace_user.o
  CC      kernel/exit.o
  CC      ipc/shm.o
  CC      arch/um/os-Linux/time.o
  AS      arch/um/sys-i386/setjmp.o
  CC      arch/um/sys-i386/signal.o
  AS      arch/um/sys-i386/stub.o
make[1]: *** [init] Error 2
  CC      arch/um/drivers/daemon_kern.o
  CC      mm/oom_kill.o
  CC      arch/um/os-Linux/tty.o
  CC      ipc/ipcns_notifier.o
  CC      arch/um/os-Linux/uaccess.o
  CC      arch/um/drivers/daemon_user.o
  CC      arch/um/sys-i386/stub_segv.o
In file included from /scratch/kisskb/src/include/linux/dmaengine.h:26,
                 from /scratch/kisskb/src/include/linux/skbuff.h:30,
                 from /scratch/kisskb/src/include/linux/netfilter.h:6,
                 from /scratch/kisskb/src/include/net/netns/x_tables.h:5,
                 from /scratch/kisskb/src/include/net/net_namespace.h:18,
                 from /scratch/kisskb/src/include/linux/init_task.h:13,
                 from /scratch/kisskb/src/kernel/fork.c:462:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  CC      arch/um/drivers/mcast_kern.o
  CC      arch/um/os-Linux/umid.o
  CC      mm/fadvise.o
  CC      kernel/itimer.o
make[2]: *** [kernel/fork.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      fs/super.o
  CC      arch/um/os-Linux/tls.o
  CC      arch/um/drivers/mcast_user.o
  CC      arch/um/os-Linux/user_syms.o
In file included from /scratch/kisskb/src/include/linux/dmaengine.h:26,
                 from /scratch/kisskb/src/include/linux/skbuff.h:30,
                 from /scratch/kisskb/src/include/linux/netfilter.h:6,
                 from /scratch/kisskb/src/include/net/netns/x_tables.h:5,
                 from /scratch/kisskb/src/include/net/net_namespace.h:18,
                 from /scratch/kisskb/src/include/linux/init_task.h:13,
                 from /scratch/kisskb/src/kernel/exit.c:49:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  CC      ipc/syscall.o
  CC      arch/um/drivers/mconsole_kern.o
  CC      arch/um/sys-i386/syscalls.o
  CC      arch/um/drivers/mconsole_user.o
  CC      arch/um/os-Linux/util.o
In file included from /scratch/kisskb/src/include/linux/dmaengine.h:26,
                 from /scratch/kisskb/src/include/linux/skbuff.h:30,
                 from /scratch/kisskb/src/include/linux/if_ether.h:125,
                 from /scratch/kisskb/src/include/linux/netdevice.h:29,
                 from /scratch/kisskb/src/arch/um/drivers/daemon_kern.c:10:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  CC      arch/um/sys-i386/sysrq.o
make[2]: *** [kernel/exit.o] Error 1
  CC      fs/char_dev.o
  AS      arch/um/sys-i386/sys_call_table.o
  CC      arch/um/os-Linux/drivers/ethertap_kern.o
In file included from /scratch/kisskb/src/include/linux/dmaengine.h:26,
                 from /scratch/kisskb/src/include/linux/skbuff.h:30,
                 from /scratch/kisskb/src/include/linux/if_ether.h:125,
                 from /scratch/kisskb/src/include/linux/netdevice.h:29,
                 from /scratch/kisskb/src/arch/um/drivers/mcast_kern.c:15:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  CC      arch/um/sys-i386/tls.o
  CC      arch/um/os-Linux/skas/mem.o
  CC      mm/maccess.o
make[2]: *** [arch/um/drivers/daemon_kern.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      mm/page_alloc.o
  CC      mm/page-writeback.o
make[2]: *** [arch/um/drivers/mcast_kern.o] Error 1
  CC      arch/um/os-Linux/skas/process.o
  CC      fs/stat.o
  CC      fs/exec.o
  CC      fs/pipe.o
  CC      arch/um/os-Linux/drivers/ethertap_user.o
  CC      mm/readahead.o
  CC      mm/swap.o
  CC      arch/um/sys-i386/elfcore.o
  CC      mm/truncate.o
  CC      fs/namei.o
In file included from /scratch/kisskb/src/include/linux/dmaengine.h:26,
                 from /scratch/kisskb/src/include/linux/skbuff.h:30,
                 from /scratch/kisskb/src/include/linux/if_ether.h:125,
                 from /scratch/kisskb/src/include/linux/netdevice.h:29,
                 from /scratch/kisskb/src/arch/um/os-Linux/drivers/ethertap_kern.c:10:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  CC      arch/um/os-Linux/sys-i386/registers.o
make[3]: *** [arch/um/os-Linux/drivers/ethertap_kern.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      arch/um/os-Linux/sys-i386/signal.o
  AS      arch/um/sys-i386/../../x86/lib/semaphore_32.o
  CC      fs/fcntl.o
  CC      ipc/ipc_sysctl.o
  CC      arch/um/sys-i386/../../x86/lib/string_32.o
  CC      arch/um/sys-i386/../../x86/kernel/module.o
  CC      ipc/mqueue.o
  CC      ipc/mq_sysctl.o
  CC      fs/ioctl.o
  CC      arch/um/os-Linux/sys-i386/task_size.o
  CC      fs/readdir.o
  CC      arch/um/os-Linux/sys-i386/tls.o
  CC      fs/select.o
  CC      fs/fifo.o
  CC      mm/vmscan.o
  CC      mm/shmem.o
  CC      mm/prio_tree.o
  CC      fs/dcache.o
  CC      mm/util.o
  CC      fs/inode.o
  CC      mm/mmzone.o
  CC      fs/attr.o
  CC      mm/vmstat.o
In file included from /scratch/kisskb/src/include/linux/dmaengine.h:26,
                 from /scratch/kisskb/src/include/linux/skbuff.h:30,
                 from /scratch/kisskb/src/ipc/mqueue.c:26:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  CC      fs/bad_inode.o
  CC      mm/backing-dev.o
make[1]: *** [arch/um/drivers] Error 2
  CC      fs/file.o
  CC      mm/page_isolation.o
  LD      arch/um/os-Linux/skas/built-in.o
  LD      arch/um/os-Linux/sys-i386/built-in.o
  CC      mm/mm_init.o
  LD      arch/um/sys-i386/subarch.o
make[2]: *** [arch/um/os-Linux/drivers] Error 2
make[2]: *** Waiting for unfinished jobs....
  CC      mm/mmu_context.o
make[1]: *** [arch/um/os-Linux] Error 2
  CC      mm/fremap.o
  LD      arch/um/sys-i386/built-in.o
  CC      fs/filesystems.o
make[2]: *** [ipc/mqueue.o] Error 1
make[1]: *** [ipc] Error 2
  CC      mm/highmem.o
  CC      fs/namespace.o
  CC      mm/madvise.o
  CC      mm/memory.o
  CC      fs/seq_file.o
  CC      mm/mincore.o
  CC      fs/xattr.o
  CC      mm/mlock.o
  CC      mm/mmap.o
  CC      fs/libfs.o
  CC      mm/mprotect.o
  CC      mm/mremap.o
  CC      fs/fs-writeback.o
  CC      fs/pnode.o
  CC      fs/drop_caches.o
  CC      mm/msync.o
  CC      fs/splice.o
  CC      fs/sync.o
  CC      mm/rmap.o
  CC      fs/utimes.o
  CC      mm/vmalloc.o
  CC      mm/pagewalk.o
  CC      mm/init-mm.o
  CC      fs/stack.o
  CC      mm/page_io.o
  CC      fs/fs_struct.o
  CC      mm/swap_state.o
  CC      fs/statfs.o
  CC      mm/swapfile.o
  CC      fs/buffer.o
  CC      mm/thrash.o
  CC      fs/bio.o
  CC      mm/dmapool.o
  CC      fs/block_dev.o
  CC      mm/slab.o
  CC      fs/direct-io.o
make[1]: *** [kernel] Error 2
  CC      fs/mpage.o
  CC      mm/percpu_up.o
  CC      fs/ioprio.o
In file included from /scratch/kisskb/src/mm/dmapool.c:26:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  LD      fs/autofs/built-in.o
make[2]: *** [mm/dmapool.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  LD      fs/autofs4/built-in.o
  CC      fs/devpts/inode.o
  CC [M]  fs/autofs/dirhash.o
  CC [M]  fs/autofs4/init.o
  CC [M]  fs/autofs/init.o
  CC      fs/ext2/balloc.o
/scratch/kisskb/src/mm/slab.c: In function 'kfree':
/scratch/kisskb/src/mm/slab.c:3854: warning: passing argument 2 of '__cache_free' discards qualifiers from pointer target type
  CC [M]  fs/autofs/inode.o
  CC      fs/hostfs/hostfs_kern.o
  CC      fs/hostfs/hostfs_user.o
  LD      fs/isofs/built-in.o
  CC [M]  fs/autofs/root.o
  CC      fs/ext3/balloc.o
  CC [M]  fs/isofs/namei.o
  CC [M]  fs/autofs4/inode.o
  CC      fs/nls/nls_base.o
  CC [M]  fs/autofs4/root.o
  CC      fs/jbd/transaction.o
/scratch/kisskb/src/fs/autofs/root.c:30: warning: 'autofs_root_compat_ioctl' declared 'static' but never defined
  CC      fs/notify/fsnotify.o
  CC      fs/jbd/commit.o
  CC      fs/partitions/check.o
  CC [M]  fs/autofs4/symlink.o
  LD      fs/devpts/devpts.o
  CC      fs/partitions/msdos.o
  LD      fs/devpts/built-in.o
  CC      fs/ext3/bitmap.o
  CC [M]  fs/isofs/inode.o
  CC [M]  fs/autofs4/waitq.o
  CC      fs/quota/dquot.o
/scratch/kisskb/src/fs/autofs4/root.c:31: warning: 'autofs4_root_compat_ioctl' declared 'static' but never defined
  CC      fs/proc/mmu.o
  LD      fs/nls/built-in.o
  CC      fs/ramfs/inode.o
  CC      fs/sysfs/inode.o
  CC      fs/eventpoll.o
  CC      fs/ext3/dir.o
  CC      fs/ext3/file.o
  CC      fs/reiserfs/bitmap.o
/scratch/kisskb/src/fs/autofs4/symlink.c: In function 'autofs4_follow_link':
/scratch/kisskb/src/fs/autofs4/symlink.c:18: warning: passing argument 2 of 'nd_set_link' discards qualifiers from pointer target type
  CC      fs/ext3/fsync.o
  CC [M]  fs/autofs/symlink.o
  CC      fs/notify/notification.o
  CC      fs/quota/quota.o
  CC      fs/anon_inodes.o
  CC      fs/ext3/ialloc.o
  CC      fs/proc/task_mmu.o
  CC [M]  fs/autofs4/expire.o
  CC      fs/signalfd.o
  CC      fs/ext2/dir.o
  CC      fs/timerfd.o
  CC      fs/ext2/file.o
  CC [M]  fs/autofs4/dev-ioctl.o
  LD      fs/hostfs/hostfs.o
  CC      fs/proc/inode.o
  CC [M]  fs/isofs/dir.o
  CC      fs/ext3/inode.o
  CC [M]  fs/autofs/waitq.o
  LD      fs/hostfs/built-in.o
  CC [M]  fs/isofs/util.o
  CC      fs/eventfd.o
  CC      fs/proc/root.o
  LD      fs/partitions/built-in.o
  CC      fs/aio.o
  CC      fs/ramfs/file-mmu.o
  CC      fs/locks.o
  CC      fs/binfmt_script.o
  CC      fs/ext3/ioctl.o
  CC      fs/ext3/namei.o
  CC      fs/sysfs/file.o
  CC      fs/binfmt_elf.o
  CC      fs/notify/group.o
make[1]: *** [mm] Error 2
  CC      fs/notify/inode_mark.o
  CC      fs/sysfs/dir.o
  CC      fs/jbd/recovery.o
  CC      fs/notify/mark.o
  CC [M]  fs/isofs/rock.o
  LD [M]  fs/autofs/autofs.o
  CC      fs/ext2/ialloc.o
  CC [M]  fs/binfmt_misc.o
  LD      fs/ramfs/ramfs.o
  CC [M]  fs/isofs/export.o
  CC      fs/sysfs/symlink.o
  CC      fs/proc/base.o
  LD      fs/ramfs/built-in.o
  CC      fs/proc/generic.o
  CC      fs/ext2/inode.o
  CC      fs/ext3/super.o
  CC      fs/ext3/symlink.o
  CC      fs/ext2/ioctl.o
  CC      fs/proc/array.o
  CC      fs/proc/proc_tty.o
  CC [M]  fs/isofs/joliet.o
  LD [M]  fs/autofs4/autofs4.o
  CC      fs/ext2/namei.o
  CC      fs/reiserfs/do_balan.o
  CC      fs/ext2/super.o
  CC      fs/jbd/checkpoint.o
  CC      fs/notify/vfsmount_mark.o
  CC      fs/proc/cmdline.o
  CC      fs/ext2/symlink.o
  CC      fs/ext3/hash.o
  CC      fs/sysfs/mount.o
  CC      fs/notify/dnotify/dnotify.o
  CC      fs/reiserfs/namei.o
  LD      fs/notify/fanotify/built-in.o
  CC      fs/ext3/resize.o
  CC      fs/jbd/revoke.o
  CC      fs/proc/cpuinfo.o
  CC      fs/sysfs/bin.o
  CC      fs/reiserfs/inode.o
  CC      fs/reiserfs/file.o
  CC      fs/notify/inotify/inotify_fsnotify.o
  CC      fs/ext3/ext3_jbd.o
  LD [M]  fs/isofs/isofs.o
  CC      fs/notify/inotify/inotify_user.o
  CC      fs/sysfs/group.o
  CC      fs/proc/devices.o
  CC      fs/jbd/journal.o
  LD      fs/quota/built-in.o
  CC      fs/reiserfs/dir.o
  CC      fs/proc/interrupts.o
  CC      fs/reiserfs/fix_node.o
  CC      fs/proc/loadavg.o
  CC      fs/proc/meminfo.o
  CC      fs/reiserfs/super.o
  CC      fs/reiserfs/prints.o
  LD      fs/notify/dnotify/built-in.o
  CC      fs/proc/stat.o
  CC      fs/reiserfs/objectid.o
  CC      fs/proc/uptime.o
  CC      fs/reiserfs/lbalance.o
  CC      fs/proc/version.o
  CC      fs/proc/softirqs.o
  CC      fs/reiserfs/ibalance.o
  CC      fs/reiserfs/stree.o
  CC      fs/reiserfs/hashes.o
  CC      fs/reiserfs/tail_conversion.o
  CC      fs/reiserfs/journal.o
  LD      fs/sysfs/built-in.o
  CC      fs/reiserfs/resize.o
  CC      fs/reiserfs/item_ops.o
  CC      fs/reiserfs/ioctl.o
  CC      fs/reiserfs/xattr.o
  LD      fs/notify/inotify/built-in.o
  CC      fs/proc/proc_sysctl.o
  CC      fs/reiserfs/lock.o
  LD      fs/notify/built-in.o
  CC      fs/proc/proc_net.o
  CC      fs/proc/kcore.o
  CC      fs/proc/kmsg.o
  LD      fs/ext2/ext2.o
  CC      fs/proc/page.o
  LD      fs/ext2/built-in.o
In file included from /scratch/kisskb/src/include/linux/dmaengine.h:26,
                 from /scratch/kisskb/src/include/linux/skbuff.h:30,
                 from /scratch/kisskb/src/include/linux/netfilter.h:6,
                 from /scratch/kisskb/src/include/net/netns/x_tables.h:5,
                 from /scratch/kisskb/src/include/net/net_namespace.h:18,
                 from /scratch/kisskb/src/fs/proc/proc_net.c:24:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
make[3]: *** [fs/proc/proc_net.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  LD      fs/jbd/jbd.o
  LD      fs/jbd/built-in.o
  LD      fs/ext3/ext3.o
make[2]: *** [fs/proc] Error 2
make[2]: *** Waiting for unfinished jobs....
  LD      fs/ext3/built-in.o
  LD      fs/reiserfs/reiserfs.o
  LD      fs/reiserfs/built-in.o
make[1]: *** [fs] Error 2
make: *** [sub-make] Error 2
make failed, trying to bisect ..
## bisect start
Last known good revision e71de5610aaf32cc05f6271c4a619ca80358433f
# < git symbolic-ref HEAD
# < git merge-base e71de5610aaf32cc05f6271c4a619ca80358433f f55f020329dc0c52ff843cb53f4c861cbf2db921

Good rev is not an ancestor, rebased tree?
Traceback (most recent call last):
  File "/scratch/kisskb/prod/kisskb/kisskb3/backend/backend.py", line 152, in _do_build
    raise BuildFailedException(e)
BuildFailedException: Failed running "/scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linux-next_um-defconfig_um-i386 CROSS_COMPILE=/opt/crosstool/gcc-4.2.3-glibc-2.3.6/i386-unknown-linux-gnu/bin/i386-unknown-linux-gnu- SUBARCH=i386 " (2)