# < git ls-remote /scratch/git/linus.git refs/heads/master
# < git rev-parse tmp/linus
remote == local, skipping fetch
# < git rev-parse tmp/linus
Upstream revision is d7824370e26325c881b665350ce64fb0a4fde24a
Head not built, building
# < git reset --mixed
# git branch -D linus
Deleted branch linus (was d782437).
# git checkout -q -f -b linus tmp/linus
# < 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/linus_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 128
# < /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linus_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 128
# /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linus_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 128
  GEN     /scratch/kisskb/build/linus_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/linus_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
  CC      arch/um/kernel/physmem.o
  UPD     include/generated/compile.h
  CC      arch/um/kernel/process.o
  CC      arch/um/kernel/ptrace.o
  CC      arch/um/os-Linux/aio.o
  CC      arch/um/os-Linux/elf_aux.o
  CC      arch/um/kernel/reboot.o
  CC      arch/um/os-Linux/execvp.o
  CC      arch/um/sys-i386/bug.o
  CC      arch/um/sys-i386/bugs.o
  CC      arch/um/os-Linux/file.o
  CC      init/version.o
  CC      arch/um/os-Linux/helper.o
  CC      arch/um/kernel/sigio.o
  LD      arch/x86/crypto/built-in.o
  AS      arch/um/sys-i386/checksum.o
  CC      arch/um/os-Linux/irq.o
  CC      arch/um/kernel/signal.o
  CC      arch/um/os-Linux/main.o
  CC      arch/um/sys-i386/delay.o
  CC      arch/um/kernel/smp.o
  CC      arch/um/os-Linux/mem.o
  CC      arch/um/sys-i386/fault.o
  CC      arch/um/kernel/syscall.o
  CC      arch/um/sys-i386/ksyms.o
  CC      arch/um/os-Linux/process.o
  CC      arch/um/kernel/sysrq.o
  CC      arch/um/sys-i386/ldt.o
  CC      kernel/sched.o
  CC      arch/um/os-Linux/registers.o
  CC      arch/um/kernel/time.o
  CC      arch/um/sys-i386/ptrace.o
  CC      arch/um/os-Linux/sigio.o
  CC      kernel/fork.o
  CC      mm/bootmem.o
  CC      arch/um/sys-i386/ptrace_user.o
  CC      arch/um/kernel/tlb.o
  CC      kernel/exec_domain.o
  CC      mm/filemap.o
  CC      arch/um/os-Linux/signal.o
  CC      arch/um/kernel/trap.o
  AS      arch/um/sys-i386/setjmp.o
  CC      arch/um/os-Linux/start_up.o
  CC      kernel/panic.o
  CC      arch/um/kernel/uaccess.o
  CC      mm/mempool.o
  CC      arch/um/sys-i386/signal.o
  CC      arch/um/os-Linux/time.o
  CC      mm/oom_kill.o
  CC      arch/um/kernel/umid.o
  CC      arch/um/kernel/um_arch.o
  CC      kernel/printk.o
  AS      arch/um/sys-i386/stub.o
  CC      arch/um/os-Linux/tty.o
  CC      kernel/cpu.o
  CC      mm/fadvise.o
  CC      arch/um/sys-i386/stub_segv.o
  CC      arch/um/os-Linux/uaccess.o
  CC      arch/um/drivers/stdio_console.o
  CC      kernel/exit.o
  CC      arch/um/os-Linux/umid.o
  CC      mm/maccess.o
  CC      arch/um/drivers/fd.o
  LDS     arch/um/kernel/vmlinux.lds
  CC      arch/um/sys-i386/syscalls.o
  CC      arch/um/os-Linux/tls.o
  CC      arch/um/drivers/chan_kern.o
  CC      kernel/itimer.o
  CC      mm/page_alloc.o
  CC      arch/um/kernel/skas/clone.o
  TIMEC   kernel/timeconst.h
  CC      mm/page-writeback.o
  CC      arch/um/drivers/chan_user.o
  AS      arch/um/sys-i386/sys_call_table.o
  CC      arch/um/os-Linux/util.o
  CC      arch/um/os-Linux/user_syms.o
  CC      arch/um/sys-i386/sysrq.o
  CC      arch/um/kernel/skas/mmu.o
  CC      arch/um/drivers/line.o
  CC      kernel/softirq.o
  CC      ipc/util.o
  CC      mm/readahead.o
  CC      arch/um/sys-i386/tls.o
  CC      ipc/msgutil.o
  CC      arch/um/drivers/ssl.o
  CC      arch/um/kernel/skas/process.o
  CC      kernel/resource.o
  CC      arch/um/drivers/stderr_console.o
  CC      arch/um/sys-i386/elfcore.o
  CC      mm/swap.o
  CC      arch/um/kernel/skas/syscall.o
  AS      arch/um/sys-i386/../../x86/lib/semaphore_32.o
  CC      ipc/msg.o
  CC      kernel/sysctl.o
  CC      mm/truncate.o
  CC      arch/um/kernel/skas/uaccess.o
  CC      security/commoncap.o
  CC      arch/um/sys-i386/../../x86/lib/string_32.o
  CC      arch/um/drivers/daemon_kern.o
  CC      mm/vmscan.o
  CC      arch/um/os-Linux/sys-i386/registers.o
  CC      arch/um/drivers/daemon_user.o
  CC      kernel/sysctl_binary.o
  CC      arch/um/os-Linux/skas/process.o
  CC      arch/um/os-Linux/skas/mem.o
  CC      arch/um/sys-i386/../../x86/kernel/module.o
  CC      kernel/capability.o
  CC      mm/shmem.o
  CC      arch/um/os-Linux/sys-i386/signal.o
  CC      kernel/ptrace.o
  CC      ipc/sem.o
  CC      security/min_addr.o
  CC      mm/prio_tree.o
  CC      arch/um/os-Linux/sys-i386/task_size.o
  CC      arch/um/drivers/mcast_kern.o
  CC      ipc/shm.o
  CC      fs/open.o
  CC      arch/um/os-Linux/drivers/ethertap_kern.o
  CC      arch/um/os-Linux/sys-i386/tls.o
  CC      mm/util.o
  CC      block/elevator.o
  CC      crypto/api.o
  CC      crypto/cipher.o
  CC      crypto/compress.o
  CC      kernel/timer.o
  CC      block/blk-core.o
  CC      ipc/ipcns_notifier.o
  QUOTE   arch/um/kernel/config.c
  CC      fs/read_write.o
  CC      arch/um/kernel/config.o
  CC      arch/um/drivers/mcast_user.o
  CC      fs/file_table.o
  CC      mm/mmzone.o
/scratch/kisskb/src/arch/um/kernel/exec.c: In function 'execve1':
/scratch/kisskb/src/arch/um/kernel/exec.c:52: warning: passing argument 1 of 'do_execve' discards qualifiers from pointer target type
  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/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:147: 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      mm/backing-dev.o
  CC      mm/page_isolation.o
  CC      mm/mm_init.o
make[2]: *** [arch/um/kernel/init_task.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      ipc/syscall.o
  CC      mm/mmu_context.o
  CC      mm/fremap.o
  CC      arch/um/drivers/mconsole_kern.o
  CC [M]  crypto/algapi.o
  CC      mm/highmem.o
  CC [M]  crypto/scatterwalk.o
  CC [M]  crypto/proc.o
  CC      mm/madvise.o
  CC      ipc/ipc_sysctl.o
  CC      arch/um/os-Linux/drivers/ethertap_user.o
  CC      ipc/mqueue.o
  CC      arch/um/drivers/mconsole_user.o
  LD      sound/built-in.o
  CC      arch/um/drivers/net_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:147: 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      drivers/auxdisplay/built-in.o
  CC      arch/um/os-Linux/drivers/tuntap_kern.o
  CC      mm/memory.o
  CC      kernel/user.o
  CC      arch/um/os-Linux/drivers/tuntap_user.o
  CC [M]  sound/sound_core.o
  CC      ipc/mq_sysctl.o
  CC      fs/super.o
  CC      drivers/base/core.o
  CC      kernel/signal.o
  CC      block/blk-tag.o
  CC      block/blk-sysfs.o
  CC      fs/char_dev.o
  CC      drivers/base/sys.o
  LD      firmware/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/ip_vs.h:24,
                 from /scratch/kisskb/src/kernel/sysctl_binary.c:6:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      drivers/base/bus.o
  LD      arch/um/os-Linux/sys-i386/built-in.o
  CC      kernel/sys.o
  CC      fs/stat.o
  CC      block/blk-barrier.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:147: 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      block/blk-settings.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:147: 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/net_user.o
  CC      fs/exec.o
  CC      drivers/base/dd.o
  CC      arch/um/drivers/port_kern.o
  CC [M]  crypto/aes_generic.o
  CC [M]  crypto/rng.o
  CC      net/socket.o
make[3]: *** [arch/um/os-Linux/drivers/ethertap_kern.o] Error 1
make[3]: *** Waiting for unfinished jobs....
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:147: 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      block/blk-ioc.o
  CC      fs/pipe.o
  CC      arch/um/drivers/port_user.o
  CC      lib/bcd.o
make[2]: *** [arch/um/drivers/mcast_kern.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      drivers/base/driver.o
  CC [M]  crypto/krng.o
make[2]: *** [arch/um/drivers/daemon_kern.o] Error 1
  CC      drivers/base/class.o
  LD      drivers/block/built-in.o
  CC [M]  drivers/block/loop.o
  CC      kernel/kmod.o
  CC      fs/namei.o
  CC      lib/div64.o
  CC      fs/fcntl.o
  CC [M]  drivers/block/nbd.o
  LD      drivers/cdrom/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/netlink.h:152,
                 from /scratch/kisskb/src/include/linux/rtnetlink.h:5,
                 from /scratch/kisskb/src/crypto/algapi.c:19:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      mm/mincore.o
  CC      fs/ioctl.o
  CC      mm/mlock.o
  CC      mm/mmap.o
  CC      mm/mprotect.o
  CC      block/blk-map.o
  CC      drivers/base/platform.o
  CC      fs/readdir.o
  CC      drivers/char/mem.o
  CC      kernel/workqueue.o
  CC      kernel/pid.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/net/socket.c:68:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      drivers/char/random.o
  CC      lib/sort.o
  LD      net/802/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/ipc/mqueue.c:26:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      lib/parser.o
  CC      drivers/char/tty_io.o
  CC      mm/mremap.o
  CC      block/blk-exec.o
  CC      net/core/sock.o
  CC [M]  crypto/ansi_cprng.o
  CC      block/blk-merge.o
  CC      fs/select.o
  CC      kernel/rcupdate.o
make[2]: *** [crypto/algapi.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      mm/msync.o
  CC      kernel/extable.o
  CC      block/blk-softirq.o
  CC      fs/fifo.o
  CC      block/blk-timeout.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/security/commoncap.c:21:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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[2]: *** [net/socket.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      block/blk-iopoll.o
make[2]: *** [security/commoncap.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      block/blk-lib.o
  CC      block/ioctl.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/etherdevice.h:27,
                 from /scratch/kisskb/src/arch/um/drivers/net_kern.c:10:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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[2]: *** [kernel/sysctl_binary.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      block/genhd.o
  CC      block/scsi_ioctl.o
  CC      lib/halfmd4.o
  CC      mm/rmap.o
  CC      fs/dcache.o
  CC      lib/debug_locks.o
make[2]: *** [arch/um/drivers/net_kern.o] Error 1
  LD      arch/um/os-Linux/skas/built-in.o
  CC      net/core/request_sock.o
  LD      arch/um/sys-i386/subarch.o
  CC      mm/vmalloc.o
  CC      mm/pagewalk.o
  CC      block/noop-iosched.o
  CC      mm/init-mm.o
  LD      arch/um/kernel/skas/built-in.o
  CC      fs/inode.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/include/net/sock.h:50,
                 from /scratch/kisskb/src/drivers/block/nbd.c:32:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/attr.o
  CC      fs/bad_inode.o
  CC      fs/file.o
  CC      fs/filesystems.o
  CC      fs/namespace.o
  CC      lib/random32.o
make[2]: *** [init/do_mounts.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      net/core/skbuff.o
  CC      drivers/char/n_tty.o
  CC      mm/page_io.o
  LD      drivers/clocksource/built-in.o
  CC      fs/seq_file.o
  CC      drivers/base/cpu.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/kernel/sysctl.c:50:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/xattr.o
  CC      lib/bust_spinlocks.o
  CC      net/core/iovec.o
  CC      drivers/base/firmware.o
  CC      net/core/datagram.o
  CC      fs/libfs.o
  CC      mm/swap_state.o
  CC      lib/hexdump.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:147: 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      drivers/base/init.o
  CC      lib/kasprintf.o
  CC      lib/bitmap.o
  CC      net/core/stream.o
make[1]: *** [init] Error 2
make[1]: *** Waiting for unfinished jobs....
  CC      mm/swapfile.o
  CC      block/deadline-iosched.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/tuntap_kern.c:6:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      drivers/crypto/built-in.o
  CC      mm/thrash.o
  CC      net/core/scm.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/net/core/skbuff.c:48:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      drivers/char/tty_ioctl.o
  CC      mm/dmapool.o
  CC      mm/slab.o
  CC      block/cfq-iosched.o
  CC      mm/percpu_up.o
  CC      fs/fs-writeback.o
  CC      fs/pnode.o
  CC      lib/scatterlist.o
  CC      fs/drop_caches.o
  CC      lib/string_helpers.o
make[1]: *** [security] Error 2
  CC      fs/splice.o
  CC      drivers/base/map.o
  LD      arch/um/sys-i386/built-in.o
  CC      drivers/base/devres.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/kernel/audit.h:24,
                 from /scratch/kisskb/src/kernel/signal.c:38:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      drivers/base/attribute_container.o
In file included from /scratch/kisskb/src/include/scsi/scsi_cmnd.h:4,
                 from /scratch/kisskb/src/block/scsi_ioctl.c:33:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/sync.o
  LD      drivers/firmware/built-in.o
  CC      net/core/gen_stats.o
  LD      drivers/gpio/built-in.o
make[3]: *** [drivers/block/nbd.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      drivers/base/transport_class.o
make[2]: *** [block/scsi_ioctl.o] Error 1
make[2]: *** Waiting for unfinished jobs....
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/include/net/sock.h:50,
                 from /scratch/kisskb/src/include/net/request_sock.h:23,
                 from /scratch/kisskb/src/net/core/request_sock.c:20:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      net/core/gen_estimator.o
  CC      net/core/net_namespace.o
  CC      net/core/sysctl_net_core.o
  LD      drivers/gpu/drm/i2c/built-in.o
  CC      fs/utimes.o
  LD      drivers/gpu/drm/built-in.o
  CC      net/core/dev.o
make[2]: *** [ipc/mqueue.o] Error 1
make[2]: *** Waiting for unfinished jobs....
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/pid.c:37:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      drivers/gpu/vga/built-in.o
  CC      fs/stack.o
  LD      drivers/gpu/built-in.o
  LD      drivers/i2c/algos/built-in.o
make[3]: *** [arch/um/os-Linux/drivers/tuntap_kern.o] Error 1
make[2]: *** [arch/um/os-Linux/drivers] Error 2
make[1]: *** [arch/um/os-Linux] Error 2
  CC      net/core/ethtool.o
In file included from /scratch/kisskb/src/drivers/base/platform.c:18:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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[2]: *** [kernel/signal.o] Error 1
  LD      drivers/i2c/busses/built-in.o
  CC      drivers/char/tty_ldisc.o
  LD      drivers/base/power/built-in.o
  CC      drivers/base/dma-mapping.o
  CC      fs/fs_struct.o
  CC      fs/statfs.o
  CC      net/core/dev_addr_lists.o
  LD      drivers/i2c/muxes/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/if_ether.h:125,
                 from /scratch/kisskb/src/include/linux/netdevice.h:29,
                 from /scratch/kisskb/src/net/core/datagram.c:46:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      net/core/dst.o
  CC      fs/buffer.o
  LD      drivers/i2c/built-in.o
  CC      drivers/base/firmware_class.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/net/core/scm.c:25:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      drivers/base/module.o
  CC      fs/bio.o
  CC      fs/block_dev.o
make[2]: *** [kernel/exit.o] Error 1
  CC      fs/direct-io.o
make[3]: *** [net/core/scm.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  LD      drivers/idle/built-in.o
make[3]: *** [drivers/base/platform.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      fs/mpage.o
make[3]: *** [net/core/datagram.o] Error 1
  CC      drivers/char/tty_buffer.o
  LD      drivers/ieee1394/built-in.o
  LD      drivers/ieee802154/built-in.o
In file included from /scratch/kisskb/src/mm/dmapool.c:26:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      drivers/lguest/built-in.o
  LD      drivers/macintosh/built-in.o
  LD      drivers/mfd/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/netlink.h:152,
                 from /scratch/kisskb/src/include/linux/rtnetlink.h:5,
                 from /scratch/kisskb/src/net/core/net_namespace.c:2:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      drivers/platform/built-in.o
  CC      drivers/net/Space.o
  LD      drivers/serial/built-in.o
  CC      drivers/net/loopback.o
  CC      lib/gcd.o
  LD      drivers/media/IR/keymaps/built-in.o
  LD      drivers/misc/cb710/built-in.o
  LD      drivers/misc/eeprom/built-in.o
make[3]: *** [net/core/net_namespace.o] Error 1
  LD      drivers/net/wireless/built-in.o
  CC [M]  drivers/net/ppp_generic.o
  CC      drivers/video/fb_notify.o
  CC [M]  drivers/net/slip.o
  CC      lib/lcm.o
  LD      drivers/media/IR/built-in.o
  CC      fs/ioprio.o
  CC      lib/list_sort.o
  LD      drivers/misc/built-in.o
  LD      drivers/video/backlight/built-in.o
  LD      drivers/video/display/built-in.o
  LD      drivers/media/common/tuners/built-in.o
  LD      drivers/media/video/davinci/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/if_ether.h:125,
                 from /scratch/kisskb/src/include/linux/netdevice.h:29,
                 from /scratch/kisskb/src/net/core/gen_estimator.c:30:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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 [M]  drivers/net/slhc.o
  CC      drivers/char/tty_port.o
  LD      drivers/media/video/built-in.o
make[2]: *** [mm/dmapool.o] Error 1
make[2]: *** Waiting for unfinished jobs....
In file included from /scratch/kisskb/src/drivers/base/dma-mapping.c:10:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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
  LD      drivers/media/common/built-in.o
  CC [M]  drivers/net/dummy.o
  LD      drivers/video/omap2/displays/built-in.o
make[3]: *** [drivers/base/dma-mapping.o] Error 1
  CC [M]  drivers/net/tun.o
  CC [M]  fs/autofs/dirhash.o
  CC      lib/uuid.o
  LD      drivers/media/built-in.o
  LD      drivers/video/omap2/dss/built-in.o
  CC      lib/find_last_bit.o
  CC      drivers/char/tty_mutex.o
  CC      fs/devpts/inode.o
  LD      fs/autofs4/built-in.o
  CC      drivers/char/pty.o
  LD      drivers/video/omap2/omapfb/built-in.o
  CC [M]  fs/autofs4/init.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:147: 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 [M]  fs/autofs4/inode.o
  CC [M]  fs/autofs/init.o
  CC [M]  fs/autofs/inode.o
  LD      drivers/video/omap2/built-in.o
  CC [M]  fs/autofs4/root.o
  CC      fs/ext2/balloc.o
  CC      fs/hostfs/hostfs_kern.o
  CC      fs/ext2/dir.o
  CC      drivers/char/misc.o
  CC      fs/hostfs/hostfs_user.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/drivers/net/loopback.c:49:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/ext3/balloc.o
  LD      fs/isofs/built-in.o
  CC      fs/jbd/transaction.o
  CC      fs/ext3/bitmap.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/drivers/net/ppp_generic.c:31:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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[2]: *** [kernel/pid.o] Error 1
  CC [M]  fs/isofs/namei.o
  CC [M]  fs/autofs/root.o
  CC [M]  fs/autofs/symlink.o
  CC [M]  fs/autofs/waitq.o
  CC      fs/nls/nls_base.o
  CC      fs/jbd/commit.o
  CC [M]  fs/isofs/inode.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/net/core/dst.c:16:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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
In file included from /scratch/kisskb/src/include/scsi/scsi_cmnd.h:4,
                 from /scratch/kisskb/src/block/blk-exec.c:14:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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 [M]  fs/isofs/dir.o
make[2]: *** [block/blk-exec.o] Error 1
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/drivers/net/dummy.c:33:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/jbd/recovery.o
  CC      drivers/char/sysrq.o
  CC      fs/ext3/dir.o
make[3]: *** [drivers/net/dummy.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      lib/hweight.o
  CC [M]  fs/autofs4/symlink.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/tcp.h:207,
                 from /scratch/kisskb/src/net/core/stream.c:18:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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 [M]  fs/autofs4/waitq.o
  CC [M]  fs/isofs/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/net/core/dev_addr_lists.c:14:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/partitions/check.o
  CC      fs/notify/fsnotify.o
  CC [M]  fs/isofs/rock.o
make[1]: *** [ipc] Error 2
  CC      fs/partitions/msdos.o
make[3]: *** [net/core/gen_estimator.o] Error 1
make[1]: *** [crypto] Error 2
  CC      fs/ext2/file.o
  CC      fs/quota/dquot.o
  CC [M]  fs/isofs/export.o
make[1]: *** [arch/um/drivers] Error 2
  CC      fs/ramfs/inode.o
  CC      fs/ext2/ialloc.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/tcp.h:207,
                 from /scratch/kisskb/src/net/core/sock.c:110:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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
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/netlink.h:152,
                 from /scratch/kisskb/src/include/linux/rtnetlink.h:5,
                 from /scratch/kisskb/src/net/core/gen_stats.c:21:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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]: *** [net/core/gen_stats.o] Error 1
  CC      fs/ramfs/file-mmu.o
make[2]: *** [kernel/sysctl.o] Error 1
  CC      fs/sysfs/inode.o
make[3]: *** [drivers/net/loopback.o] Error 1
  CC [M]  fs/isofs/joliet.o
make[2]: *** [kernel/fork.o] Error 1
  CC      lib/bitrev.o
  CC      fs/eventpoll.o
  CC      fs/reiserfs/bitmap.o
  CC      fs/sysfs/file.o
make[3]: *** [net/core/skbuff.o] Error 1
make[1]: *** [arch/um/kernel] Error 2
  CC      fs/reiserfs/do_balan.o
  CC      fs/notify/notification.o
  CC      fs/reiserfs/namei.o
  CC      fs/reiserfs/inode.o
  CC [M]  fs/autofs4/expire.o
make[3]: *** [net/core/dst.o] Error 1
  LD [M]  sound/soundcore.o
  CC      fs/ext3/file.o
  CC      fs/sysfs/dir.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/net/core/sysctl_net_core.c:12:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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]: *** [net/core/dev_addr_lists.o] Error 1
  CC      fs/jbd/checkpoint.o
  CC      fs/proc/mmu.o
  CC      fs/anon_inodes.o
  CC      fs/signalfd.o
  CC      fs/ext2/inode.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/ip.h:108,
                 from /scratch/kisskb/src/include/net/slhc_vj.h:84,
                 from /scratch/kisskb/src/drivers/net/slhc.c:59:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/proc/task_mmu.o
  HOSTCC  lib/gen_crc32table
make[3]: *** [net/core/request_sock.o] Error 1
  CC      fs/proc/inode.o
  CC      fs/timerfd.o
  CC      fs/ext2/ioctl.o
  CC [M]  fs/autofs4/dev-ioctl.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/include/net/sock.h:50,
                 from /scratch/kisskb/src/net/core/iovec.c:28:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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
/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/sysfs/symlink.o
  CC      fs/reiserfs/file.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/drivers/net/Space.c:30:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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      lib/nlattr.o
/scratch/kisskb/src/fs/autofs4/root.c:31: warning: 'autofs4_root_compat_ioctl' declared 'static' but never defined
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/net/core/ethtool.c:19:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/eventfd.o
  CC      fs/ext2/namei.o
/scratch/kisskb/src/fs/autofs/root.c:30: warning: 'autofs_root_compat_ioctl' declared 'static' but never defined
  LD      fs/nls/built-in.o
  CC      fs/reiserfs/dir.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/drivers/net/slip.c:77:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/notify/group.o
  CC      fs/quota/quota.o
  CC      fs/notify/inode_mark.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
make[3]: *** [drivers/net/ppp_generic.o] Error 1
  CC      fs/notify/mark.o
  CC      fs/sysfs/mount.o
  CC      fs/sysfs/bin.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/drivers/net/tun.c:50:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/aio.o
make[2]: *** [drivers/base] Error 2
make[2]: *** Waiting for unfinished jobs....
  CC      fs/locks.o
  LD      fs/devpts/devpts.o
  CC      fs/sysfs/group.o
  CC      fs/binfmt_script.o
  CC      lib/argv_split.o
  CC      fs/notify/vfsmount_mark.o
  LD      fs/devpts/built-in.o
  CC      fs/jbd/revoke.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/net/core/dev.c:92:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/notify/dnotify/dnotify.o
  CC      fs/proc/root.o
  LD      drivers/video/built-in.o
  CC      lib/bug.o
make[3]: *** [drivers/net/Space.o] Error 1
  CC      fs/binfmt_elf.o
  CC      lib/cmdline.o
  CC [M]  fs/binfmt_misc.o
  CC      fs/proc/base.o
  CC      fs/ext3/fsync.o
  CC      lib/ctype.o
  CC      lib/dec_and_lock.o
  CC      fs/proc/generic.o
  CC      fs/jbd/journal.o
  CC      fs/reiserfs/fix_node.o
  CC      fs/ext2/super.o
  CC      lib/decompress.o
  CC      lib/dump_stack.o
make[3]: *** [net/core/stream.o] Error 1
  CC      lib/extable.o
  LD      fs/notify/fanotify/built-in.o
  CC      fs/proc/array.o
  CC      fs/reiserfs/super.o
  CC      lib/find_next_bit.o
make[3]: *** [net/core/ethtool.o] Error 1
  CC      fs/proc/proc_tty.o
  CC      lib/flex_array.o
  CC      fs/ext3/ialloc.o
  CC      fs/ext3/inode.o
make[2]: *** [drivers/block] Error 2
  CC      lib/idr.o
  CC      fs/notify/inotify/inotify_fsnotify.o
  CC      fs/notify/inotify/inotify_user.o
  CC      fs/ext3/ioctl.o
  CC      fs/ext3/namei.o
  CC      fs/ext3/super.o
make[3]: *** [drivers/net/tun.o] Error 1
  CC      fs/ext3/symlink.o
make[3]: *** [drivers/net/slip.o] Error 1
  CC      fs/proc/cmdline.o
  CC      fs/ext3/hash.o
  CC      fs/proc/cpuinfo.o
  CC      fs/proc/devices.o
  CC      fs/ext2/symlink.o
  CC      fs/reiserfs/prints.o
  CC      fs/reiserfs/objectid.o
  CC      fs/ext3/resize.o
  CC      lib/int_sqrt.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/lib/nlattr.c:12:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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]: *** [net/core/sysctl_net_core.o] Error 1
  LD      fs/ramfs/ramfs.o
  CC      lib/ioremap.o
  LD      fs/ramfs/built-in.o
  CC      lib/irq_regs.o
  CC      fs/proc/interrupts.o
  CC      fs/ext3/ext3_jbd.o
  CC      lib/is_single_threaded.o
  CC      lib/klist.o
make[3]: *** [drivers/net/slhc.o] Error 1
  CC      fs/reiserfs/lbalance.o
make[2]: *** [drivers/net] Error 2
  CC      lib/kobject.o
  CC      lib/kobject_uevent.o
  LD [M]  fs/autofs/autofs.o
  CC      fs/proc/loadavg.o
  CC      fs/reiserfs/ibalance.o
  CC      fs/proc/meminfo.o
  CC      lib/kref.o
  CC      lib/plist.o
  CC      fs/reiserfs/stree.o
  CC      fs/reiserfs/hashes.o
  CC      fs/proc/stat.o
make[3]: *** [net/core/dev.o] Error 1
  CC      lib/prio_heap.o
  CC      fs/proc/uptime.o
  CC      lib/prio_tree.o
make[3]: *** [net/core/iovec.o] Error 1
  CC      fs/reiserfs/tail_conversion.o
  CC      fs/reiserfs/journal.o
  CC      fs/proc/version.o
make[3]: *** [net/core/sock.o] Error 1
make[2]: *** [net/core] Error 2
make[1]: *** [net] Error 2
  CC      fs/proc/softirqs.o
  CC      lib/proportions.o
  CC      fs/proc/proc_sysctl.o
  CC      lib/radix-tree.o
  CC      fs/proc/proc_net.o
  CC      fs/proc/kcore.o
  CC      fs/reiserfs/resize.o
make[2]: *** [lib/nlattr.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      fs/reiserfs/item_ops.o
  CC      fs/reiserfs/ioctl.o
  CC      fs/proc/kmsg.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/lib/kobject_uevent.c:24:
/scratch/kisskb/src/include/linux/dma-mapping.h:147: 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/proc/page.o
  CC      fs/reiserfs/xattr.o
  CC      fs/reiserfs/lock.o
  LD      fs/notify/dnotify/built-in.o
  LD [M]  fs/autofs4/autofs4.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:147: 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/hostfs/hostfs.o
  LD      fs/hostfs/built-in.o
make[2]: *** [lib/kobject_uevent.o] Error 1
make[3]: *** [fs/proc/proc_net.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  LD      fs/sysfs/built-in.o
  LD      fs/notify/inotify/built-in.o
  LD      fs/notify/built-in.o
  LD      fs/partitions/built-in.o
make[1]: *** [mm] Error 2
  LD      fs/jbd/jbd.o
  LD      fs/jbd/built-in.o
  LD [M]  fs/isofs/isofs.o
  LD      fs/ext2/ext2.o
make[1]: *** [block] Error 2
  LD      fs/ext2/built-in.o
  LD      drivers/char/built-in.o
make[1]: *** [drivers] Error 2
make[1]: *** [lib] Error 2
  LD      fs/quota/built-in.o
make[2]: *** [fs/proc] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [kernel] Error 2
  LD      fs/ext3/ext3.o
  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 3d30701b58970425e1d45994d6cb82f828924fdd
# < git symbolic-ref HEAD
# < git merge-base 3d30701b58970425e1d45994d6cb82f828924fdd d7824370e26325c881b665350ce64fb0a4fde24a

# < git ls-files --others --modified
# git ls-files --others --modified
cmd.log
# git bisect reset linus
Already on 'linus'
# git bisect start
# git bisect bad
# git bisect good 3d30701b58970425e1d45994d6cb82f828924fdd
Bisecting: 538 revisions left to test after this (roughly 9 steps)
[c6c193326384aecfd668c8f271799a44dbc74c1a] mfd: Add TPS6586x driver
Trying d7824370e26325c881b665350ce64fb0a4fde24a

# < /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linus_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 128
# /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linus_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 128
  GEN     /scratch/kisskb/build/linus_um-defconfig_um-i386/Makefile
scripts/kconfig/conf --silentoldconfig arch/um/Kconfig.x86
  GEN     /scratch/kisskb/build/linus_um-defconfig_um-i386/Makefile
  CHK     include/linux/version.h
make[2]: `arch/um/sys-i386/user-offsets.s' is up to date.
  HOSTCC  scripts/mod/modpost.o
  HOSTLD  scripts/mod/modpost
  Using /scratch/kisskb/src as source for kernel
  CHK     include/generated/utsrelease.h
  UPD     include/generated/utsrelease.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
  CC      init/do_mounts.o
  CC      init/noinitramfs.o
  CC      init/calibrate.o
  CC      init/version.o
  CC      arch/um/sys-i386/bug.o
  QUOTE   arch/um/kernel/config.tmp
  CC      security/commoncap.o
  CC      arch/um/sys-i386/bugs.o
  CC      security/min_addr.o
  CC      arch/um/sys-i386/delay.o
  CC      arch/um/kernel/exitcode.o
  CC      arch/um/kernel/exec.o
  CC      arch/um/os-Linux/aio.o
  CC      arch/um/sys-i386/ksyms.o
  CC      arch/um/os-Linux/elf_aux.o
  CC      arch/um/kernel/init_task.o
  CC      ipc/util.o
  CC      arch/um/sys-i386/ldt.o
  CC      arch/um/drivers/stdio_console.o
  CC      ipc/msgutil.o
  CC      arch/um/kernel/irq.o
  CC      kernel/sched.o
  CC      arch/um/sys-i386/ptrace.o
  CC      ipc/msg.o
  CC      arch/um/kernel/ksyms.o
  CC      ipc/sem.o
  CC      kernel/fork.o
  CC      arch/um/kernel/mem.o
  CC      arch/um/os-Linux/execvp.o
  CC      kernel/exec_domain.o
  CC      arch/um/kernel/physmem.o
  CC      arch/um/drivers/fd.o
  CC      arch/um/sys-i386/signal.o
  CC      arch/um/kernel/process.o
  CC      ipc/shm.o
  CC      kernel/panic.o
  CC      crypto/api.o
  AS      arch/um/sys-i386/stub.o
  CC      arch/um/drivers/chan_kern.o
  CC      kernel/printk.o
  CC      ipc/ipcns_notifier.o
  CC      arch/um/sys-i386/stub_segv.o
  CC      arch/um/kernel/ptrace.o
  CC      kernel/cpu.o
  CC      crypto/cipher.o
  CC      kernel/exit.o
  CC      block/elevator.o
  CC      ipc/syscall.o
  CC      crypto/compress.o
  CC      arch/um/kernel/reboot.o
  CC      arch/um/sys-i386/syscalls.o
  CC      ipc/ipc_sysctl.o
  CC      arch/um/drivers/chan_user.o
  CC      arch/um/drivers/line.o
  CC [M]  crypto/algapi.o
  CC      block/blk-core.o
  CC      ipc/mqueue.o
  CC      arch/um/kernel/sigio.o
  CC      kernel/itimer.o
  CC      arch/um/sys-i386/sysrq.o
  CC      kernel/time.o
  CC      arch/um/drivers/ssl.o
  CC      block/blk-tag.o
  CC      block/blk-sysfs.o
  CC      arch/um/sys-i386/tls.o
  CC [M]  crypto/scatterwalk.o
  CC      arch/um/os-Linux/file.o
  CC      ipc/mq_sysctl.o
  CC      arch/um/os-Linux/helper.o
  CC      block/blk-barrier.o
  CC      arch/um/os-Linux/irq.o
  CC      arch/um/drivers/stderr_console.o
  CC      arch/um/kernel/signal.o
  CC      arch/um/drivers/daemon_kern.o
  CC      block/blk-settings.o
  CC [M]  crypto/proc.o
  CC      arch/um/os-Linux/main.o
  CC      kernel/softirq.o
  CC      arch/um/sys-i386/elfcore.o
  CC      arch/um/kernel/smp.o
  CC      block/blk-ioc.o
  CC      kernel/resource.o
  CC      arch/um/drivers/daemon_user.o
  CC      arch/um/kernel/syscall.o
  CC      block/blk-map.o
  CC      block/blk-exec.o
  CC [M]  crypto/aes_generic.o
  CC      arch/um/sys-i386/../../x86/lib/string_32.o
  CC      arch/um/os-Linux/mem.o
  CC      kernel/sysctl.o
  CC      kernel/sysctl_binary.o
  CC [M]  crypto/rng.o
  CC      arch/um/drivers/mcast_kern.o
  CC      block/blk-merge.o
  CC      arch/um/os-Linux/process.o
  CC      arch/um/kernel/sysrq.o
  CC      arch/um/sys-i386/../../x86/kernel/module.o
  CC      arch/um/drivers/mcast_user.o
  CC      block/blk-softirq.o
  CC      arch/um/os-Linux/signal.o
  CC      arch/um/os-Linux/sigio.o
  CC [M]  sound/sound_core.o
  CC      arch/um/os-Linux/start_up.o
  CC [M]  crypto/krng.o
  CC      block/blk-timeout.o
  CC      arch/um/os-Linux/time.o
  CC      arch/um/kernel/time.o
  CC      kernel/capability.o
  CC      arch/um/os-Linux/tty.o
  CC [M]  crypto/ansi_cprng.o
  CC      kernel/ptrace.o
  CC      arch/um/drivers/mconsole_kern.o
  CC      block/blk-iopoll.o
  CC      arch/um/os-Linux/umid.o
  CC      arch/um/kernel/tlb.o
  CC      arch/um/drivers/mconsole_user.o
  CC      kernel/timer.o
  CC      arch/um/drivers/net_kern.o
  CC      block/blk-lib.o
  CC      kernel/user.o
  CC      arch/um/drivers/net_user.o
  CC      arch/um/kernel/trap.o
  CC      kernel/signal.o
  CC      arch/um/os-Linux/user_syms.o
  CC      block/ioctl.o
  CC      arch/um/kernel/uaccess.o
  CC      arch/um/drivers/port_kern.o
  CC      net/socket.o
  CC      arch/um/os-Linux/util.o
  CC      mm/bootmem.o
  CC      arch/um/drivers/port_user.o
  CC      arch/um/os-Linux/drivers/ethertap_kern.o
  CC      arch/um/os-Linux/drivers/ethertap_user.o
  CC      drivers/base/core.o
  CC      fs/open.o
  CC      arch/um/os-Linux/skas/mem.o
  CC      fs/read_write.o
  CC      arch/um/drivers/slip_kern.o
  CC      kernel/sys.o
  CC      kernel/kmod.o
  CC      arch/um/os-Linux/sys-i386/registers.o
  CC      kernel/workqueue.o
  CC      arch/um/kernel/um_arch.o
  CC      fs/file_table.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/kernel/umid.o
  CC      arch/um/drivers/slip_user.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
  LD      arch/um/sys-i386/subarch.o
  CC      arch/um/os-Linux/skas/process.o
  CC      mm/filemap.o
  CC      block/genhd.o
  CC      arch/um/drivers/slirp_kern.o
  CC      arch/um/drivers/slirp_user.o
  CC      arch/um/os-Linux/sys-i386/task_size.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/etherdevice.h:27,
                 from /scratch/kisskb/src/arch/um/drivers/net_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      fs/super.o
  CC      arch/um/kernel/skas/clone.o
  CC      block/scsi_ioctl.o
make[2]: *** [arch/um/drivers/daemon_kern.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      block/noop-iosched.o
  QUOTE   arch/um/kernel/config.c
make[2]: *** [arch/um/kernel/init_task.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      mm/mempool.o
  CC      block/deadline-iosched.o
  CC      arch/um/kernel/skas/mmu.o
  CC      mm/oom_kill.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/net/socket.c:68:
/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
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      kernel/pid.o
make[2]: *** [arch/um/drivers/net_kern.o] Error 1
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      kernel/rcupdate.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/kernel/skas/process.o
  CC      arch/um/os-Linux/sys-i386/tls.o
  CC      mm/fadvise.o
  CC      drivers/base/sys.o
  CC      block/cfq-iosched.o
  CC      kernel/extable.o
  CC      net/core/sock.o
  CC      mm/maccess.o
  CC      drivers/base/bus.o
  CC      net/core/request_sock.o
  CC      net/ethernet/eth.o
  CC      kernel/params.o
  CC      mm/page_alloc.o
  CC      arch/um/kernel/skas/syscall.o
  CC      kernel/posix-timers.o
  CC      fs/char_dev.o
make[3]: *** [arch/um/os-Linux/drivers/ethertap_kern.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      arch/um/kernel/skas/uaccess.o
  CC      kernel/kthread.o
make[2]: *** [arch/um/drivers/mcast_kern.o] Error 1
  CC      kernel/wait.o
  CC      lib/bcd.o
  CC      lib/div64.o
  CC      drivers/base/dd.o
  CC      net/core/skbuff.o
  CC      lib/sort.o
In file included from /scratch/kisskb/src/include/scsi/scsi_cmnd.h:4,
                 from /scratch/kisskb/src/block/blk-exec.c:14:
/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[2]: *** [block/blk-exec.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      lib/parser.o
  CC      lib/halfmd4.o
  CC      drivers/base/driver.o
  CC [M]  drivers/block/loop.o
  CC [M]  drivers/block/nbd.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/include/linux/if_arp.h:26,
                 from /scratch/kisskb/src/arch/um/drivers/slirp_kern.c:6:
/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      net/core/iovec.o
  CC      net/ipv4/route.o
  CC      drivers/char/mem.o
  CC      kernel/kfifo.o
  CC      lib/debug_locks.o
  CC      fs/stat.o
make[2]: *** [arch/um/os-Linux/drivers] Error 2
make[2]: *** Waiting for unfinished jobs....
  CC      net/core/datagram.o
  CC      kernel/sys_ni.o
  CC      drivers/char/random.o
  LD      drivers/i2c/built-in.o
  CC      net/netlink/af_netlink.o
  LD      arch/um/os-Linux/sys-i386/built-in.o
  CC      net/netlink/genetlink.o
  CC      lib/random32.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/include/linux/if_arp.h:26,
                 from /scratch/kisskb/src/arch/um/drivers/slip_kern.c:6:
/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      kernel/posix-cpu-timers.o
  CC      lib/bust_spinlocks.o
  CC      net/ipv4/inetpeer.o
  CC      mm/page-writeback.o
  CC      mm/readahead.o
  CC      drivers/char/tty_io.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/ip.h:108,
                 from /scratch/kisskb/src/net/ethernet/eth.c:48:
/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      kernel/mutex.o
  CC      lib/hexdump.o
  LD [M]  sound/soundcore.o
  CC      kernel/hrtimer.o
  CC      drivers/char/n_tty.o
  CC      kernel/rwsem.o
  CC      kernel/nsproxy.o
  CC      drivers/char/tty_ioctl.o
make[2]: *** [arch/um/drivers/slip_kern.o] Error 1
  CC      net/core/stream.o
  CC      net/core/scm.o
  CC      net/ipv4/protocol.o
  CC      kernel/srcu.o
  CC      drivers/char/tty_ldisc.o
  CC      net/ipv4/ip_input.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/net/netlink/genetlink.c:16:
/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      lib/kasprintf.o
  CC      lib/bitmap.o
  CC      drivers/net/Space.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      net/ipv4/ip_fragment.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/kernel/audit.h:24,
                 from /scratch/kisskb/src/kernel/signal.c:38:
/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      net/ipv4/ip_forward.o
  CC      lib/scatterlist.o
make[2]: *** [arch/um/drivers/slirp_kern.o] Error 1
  CC      fs/exec.o
  CC      drivers/net/loopback.o
  CC      kernel/semaphore.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/include/net/sock.h:50,
                 from /scratch/kisskb/src/include/net/request_sock.h:23,
                 from /scratch/kisskb/src/net/core/request_sock.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      drivers/base/class.o
  CC      lib/string_helpers.o
make[2]: *** [kernel/exit.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      mm/swap.o
  CC      net/ipv4/ip_options.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/tcp.h:207,
                 from /scratch/kisskb/src/net/core/sock.c:110:
/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
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/security/commoncap.c:21:
/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
In file included from /scratch/kisskb/src/include/scsi/scsi_cmnd.h:4,
                 from /scratch/kisskb/src/block/scsi_ioctl.c:33:
/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      lib/gcd.o
  CC      fs/pipe.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/netlink.h:152,
                 from /scratch/kisskb/src/include/linux/rtnetlink.h:5,
                 from /scratch/kisskb/src/crypto/algapi.c:19:
/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      net/ipv4/ip_output.o
  CC      net/packet/af_packet.o
  CC      drivers/char/tty_buffer.o
  CC      lib/lcm.o
make[3]: *** [net/ethernet/eth.o] Error 1
make[2]: *** [net/ethernet] Error 2
make[2]: *** Waiting for unfinished jobs....
  CC      net/sched/sch_generic.o
  CC      drivers/base/platform.o
  CC      net/sched/sch_mq.o
  CC      drivers/base/cpu.o
make[2]: *** [block/scsi_ioctl.o] Error 1
  CC      net/ipv4/ip_sockglue.o
  CC      lib/list_sort.o
  CC      drivers/char/tty_port.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      fs/fcntl.o
make[2]: *** [net/socket.o] Error 1
  CC      drivers/video/fb_notify.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/tcp.h:207,
                 from /scratch/kisskb/src/net/core/stream.c:18:
/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      mm/truncate.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/net/core/scm.c:25:
/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      mm/vmscan.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/net/ipv4/ip_fragment.c:28:
/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      net/ipv4/inet_hashtables.o
  CC [M]  drivers/net/ppp_generic.o
  CC      lib/uuid.o
make[2]: *** [crypto/algapi.o] Error 1
make[2]: *** Waiting for unfinished jobs....
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/net/ipv4/route.c:79:
/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/ioctl.o
  CC      net/ipv4/inet_timewait_sock.o
  CC      net/ipv4/inet_connection_sock.o
  CC      mm/shmem.o
  CC      mm/prio_tree.o
  LD      arch/um/os-Linux/skas/built-in.o
make[2]: *** [security/commoncap.o] Error 1
make[1]: *** [security] Error 2
make[1]: *** Waiting for unfinished jobs....
  CC      mm/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/net/ipv4/ip_forward.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[1]: *** [arch/um/os-Linux] Error 2
  CC      mm/mmzone.o
  CC      drivers/char/tty_mutex.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/pid.c:37:
/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      lib/find_last_bit.o
  CC      mm/vmstat.o
make[3]: *** [net/netlink/genetlink.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      net/core/gen_stats.o
  CC [M]  drivers/net/slip.o
make[2]: *** [kernel/fork.o] Error 1
  CC      drivers/char/pty.o
  CC      drivers/base/firmware.o
  CC      net/ipv4/tcp.o
  CC      lib/hweight.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/include/net/inet_sock.h:24,
                 from /scratch/kisskb/src/include/net/inet_connection_sock.h:23,
                 from /scratch/kisskb/src/net/ipv4/inet_hashtables.c:22:
/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[2]: *** [kernel/pid.o] Error 1
  CC      drivers/base/init.o
make[3]: *** [net/core/scm.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      drivers/base/map.o
  CC      lib/bitrev.o
  GEN     lib/crc32table.h
  CC      lib/nlattr.o
  CC      fs/readdir.o
  CC [M]  drivers/net/slhc.o
  CC      mm/backing-dev.o
make[3]: *** [net/core/request_sock.o] Error 1
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/net/ipv4/ip_options.c:17:
/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/select.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/net/netlink/af_netlink.c:43:
/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      lib/argv_split.o
  CC [M]  drivers/net/dummy.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/net/sched/sch_mq.c:16:
/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[2]: *** [kernel/signal.o] Error 1
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/drivers/net/ppp_generic.c:31:
/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
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      drivers/char/misc.o
make[3]: *** [net/ipv4/ip_fragment.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      fs/fifo.o
  CC      mm/page_isolation.o
make[3]: *** [net/core/stream.o] Error 1
  CC      drivers/base/devres.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/ip.h:108,
                 from /scratch/kisskb/src/include/net/inet_hashtables.h:19,
                 from /scratch/kisskb/src/net/ipv4/inet_timewait_sock.c:14:
/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 [M]  drivers/net/tun.o
In file included from /scratch/kisskb/src/drivers/base/platform.c:18:
/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      lib/bug.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/net/ipv4/ip_output.c:60:
/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/dcache.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/kernel/sysctl.c:50:
/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/inode.o
make[3]: *** [drivers/base/platform.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      fs/attr.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/ip_vs.h:24,
                 from /scratch/kisskb/src/kernel/sysctl_binary.c:6:
/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      drivers/char/sysrq.o
  CC      fs/bad_inode.o
  CC      fs/file.o
  CC      lib/cmdline.o
  CC      mm/mm_init.o
  CC      fs/filesystems.o
make[3]: *** [drivers/net/ppp_generic.o] Error 1
make[3]: *** Waiting for unfinished jobs....
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/net/core/datagram.c:46:
/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      mm/mmu_context.o
make[3]: *** [net/sched/sch_mq.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      mm/fremap.o
  CC      lib/ctype.o
  CC      fs/namespace.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/net/packet/af_packet.c:58:
/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
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/nsproxy.c:19:
/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/seq_file.o
  LD      drivers/video/built-in.o
make[1]: *** [arch/um/drivers] Error 2
  CC      mm/highmem.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/include/net/sock.h:50,
                 from /scratch/kisskb/src/net/core/iovec.c:28:
/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      arch/um/sys-i386/built-in.o
  CC      lib/dec_and_lock.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/net/ipv4/protocol.c:27:
/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/xattr.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/ip.h:108,
                 from /scratch/kisskb/src/include/net/slhc_vj.h:84,
                 from /scratch/kisskb/src/drivers/net/slhc.c:59:
/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      mm/madvise.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/net/core/skbuff.c:48:
/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      arch/um/kernel/skas/built-in.o
  CC      fs/libfs.o
make[2]: *** [ipc/mqueue.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      mm/memory.o
make[1]: *** [arch/um/kernel] Error 2
  CC      lib/dump_stack.o
  CC      fs/fs-writeback.o
  CC      lib/extable.o
  CC      fs/pnode.o
make[3]: *** [net/ipv4/protocol.o] Error 1
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/include/net/inet_sock.h:24,
                 from /scratch/kisskb/src/include/net/inet_connection_sock.h:23,
                 from /scratch/kisskb/src/net/ipv4/inet_connection_sock.c:19:
/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/drop_caches.o
  CC      mm/mincore.o
  CC      lib/find_next_bit.o
make[2]: *** [kernel/sysctl.o] Error 1
  CC      mm/mlock.o
  CC      lib/flex_array.o
  CC      lib/idr.o
  CC      fs/splice.o
make[3]: *** [net/netlink/af_netlink.o] Error 1
make[2]: *** [net/netlink] Error 2
  CC      fs/sync.o
  CC      lib/int_sqrt.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/net/ipv4/ip_sockglue.c:21:
/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]: *** [net/core/datagram.o] Error 1
  CC      mm/mmap.o
  CC      fs/utimes.o
  CC      lib/ioremap.o
  CC      fs/stack.o
make[3]: *** [net/packet/af_packet.o] Error 1
make[2]: *** [net/packet] Error 2
  CC      lib/irq_regs.o
  CC      fs/fs_struct.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/drivers/net/Space.c:30:
/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      lib/is_single_threaded.o
  CC      lib/klist.o
make[3]: *** [net/ipv4/ip_options.o] Error 1
  CC      lib/kobject.o
  CC      fs/statfs.o
make[3]: *** [drivers/net/Space.o] Error 1
  CC      fs/buffer.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/include/net/sock.h:50,
                 from /scratch/kisskb/src/drivers/block/nbd.c:32:
/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      mm/mprotect.o
  CC      fs/bio.o
  CC      lib/kobject_uevent.o
  CC      mm/msync.o
  CC      lib/kref.o
  CC      mm/mremap.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/net/sched/sch_generic.c:21:
/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
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/ip.h:108,
                 from /scratch/kisskb/src/include/net/ip.h:26,
                 from /scratch/kisskb/src/net/ipv4/inetpeer.c:20:
/scratch/kisskb/src/include/linux/dma-mapping.h:146: error: redefinition of 'dma_get_cache_alignment'
  CC      lib/plist.o
make[3]: *** [net/ipv4/inet_connection_sock.o] Error 1
  CC      fs/block_dev.o
  CC      mm/rmap.o
make[3]: *** [net/ipv4/inet_hashtables.o] Error 1
  CC      mm/vmalloc.o
  CC      lib/prio_heap.o
make[2]: *** [kernel/nsproxy.o] Error 1
make[2]: *** [init/do_mounts.o] Error 1
make[1]: *** [init] Error 2
/scratch/kisskb/src/arch/um/include/asm/dma-mapping.h:100: error: previous definition of 'dma_get_cache_alignment' was here
  CC      mm/pagewalk.o
  CC      lib/prio_tree.o
  CC      fs/direct-io.o
make[3]: *** [drivers/block/nbd.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC      fs/mpage.o
  CC      lib/proportions.o
  CC      mm/init-mm.o
make[3]: *** [net/core/iovec.o] Error 1
  CC      lib/radix-tree.o
  CC      mm/page_io.o
  CC      fs/ioprio.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/include/linux/inetdevice.h:8,
                 from /scratch/kisskb/src/net/ipv4/ip_input.c:129:
/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
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/lib/nlattr.c:12:
/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[2]: *** [kernel/sysctl_binary.o] Error 1
  CC      lib/ratelimit.o
make[3]: *** [net/core/skbuff.o] Error 1
  CC      mm/swap_state.o
  CC      lib/rbtree.o
  CC      mm/swapfile.o
  CC      lib/reciprocal_div.o
  CC      lib/rwsem.o
make[2]: *** [lib/nlattr.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      mm/thrash.o
make[3]: *** [net/core/sock.o] Error 1
  CC      mm/dmapool.o
  CC      fs/devpts/inode.o
  CC      mm/slab.o
  CC [M]  fs/autofs/dirhash.o
make[1]: *** [crypto] Error 2
  CC      mm/percpu_up.o
  CC [M]  fs/autofs4/init.o
  CC [M]  fs/autofs/init.o
  CC [M]  fs/autofs4/inode.o
  CC [M]  fs/autofs/inode.o
  CC      fs/hostfs/hostfs_kern.o
  CC      fs/nls/nls_base.o
  CC [M]  fs/autofs/root.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/net/ipv4/tcp.c:255:
/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 [M]  fs/autofs/symlink.o
  CC [M]  fs/autofs/waitq.o
  CC      fs/jbd/transaction.o
  CC [M]  fs/autofs4/root.o
  CC [M]  fs/isofs/namei.o
make[2]: *** [drivers/base] Error 2
make[2]: *** Waiting for unfinished jobs....
  CC [M]  fs/isofs/inode.o
  CC      fs/notify/fsnotify.o
  CC      fs/partitions/check.o
  CC [M]  fs/autofs4/symlink.o
  CC [M]  fs/isofs/dir.o
  CC      fs/jbd/commit.o
make[3]: *** [net/ipv4/inet_timewait_sock.o] Error 1
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/drivers/net/loopback.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 [M]  fs/autofs4/waitq.o
  CC      fs/partitions/msdos.o
  CC [M]  fs/autofs4/expire.o
  CC      fs/ramfs/inode.o
  CC      fs/quota/dquot.o
  CC      fs/hostfs/hostfs_user.o
  CC      fs/ext3/balloc.o
  CC      fs/jbd/recovery.o
  CC      fs/ramfs/file-mmu.o
  CC      fs/jbd/checkpoint.o
  CC      fs/ext2/balloc.o
  CC      fs/ext3/bitmap.o
  CC      fs/quota/quota.o
  CC      fs/ext2/dir.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/drivers/net/slip.c:77:
/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
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/lib/kobject_uevent.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
  CC      fs/ext3/dir.o
/scratch/kisskb/src/fs/autofs/root.c:30: warning: 'autofs_root_compat_ioctl' declared 'static' but never defined
  CC      fs/jbd/revoke.o
  CC      fs/jbd/journal.o
  CC      fs/ext2/file.o
  CC [M]  fs/autofs4/dev-ioctl.o
  CC      fs/ext3/file.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/drivers/net/dummy.c:33:
/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]: *** [drivers/net/slhc.o] Error 1
  CC      fs/sysfs/inode.o
  CC      fs/ext2/ialloc.o
  CC      fs/sysfs/file.o
  CC      fs/proc/mmu.o
  CC      fs/ext2/inode.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/netlink.h:152,
                 from /scratch/kisskb/src/include/linux/rtnetlink.h:5,
                 from /scratch/kisskb/src/net/core/gen_stats.c:21:
/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]: *** [drivers/net/dummy.o] Error 1
make[3]: *** [drivers/net/slip.o] Error 1
  CC      fs/ext2/ioctl.o
  CC      fs/eventpoll.o
  CC      fs/ext3/fsync.o
make[3]: *** [net/sched/sch_generic.o] Error 1
make[2]: *** [net/sched] Error 2
  CC      fs/notify/notification.o
  CC      fs/ext3/ialloc.o
  CC      fs/proc/task_mmu.o
make[3]: *** [net/ipv4/ip_input.o] Error 1
  CC      fs/ext3/inode.o
  CC [M]  fs/isofs/util.o
make[3]: *** [net/ipv4/ip_output.o] Error 1
  CC      fs/ext3/ioctl.o
  CC      fs/ext2/namei.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
make[3]: *** [net/ipv4/route.o] Error 1
  CC      fs/ext3/namei.o
make[3]: *** [drivers/net/loopback.o] Error 1
  CC      fs/notify/group.o
make[3]: *** [net/ipv4/ip_forward.o] Error 1
  CC      fs/sysfs/dir.o
  CC      fs/notify/inode_mark.o
  CC      fs/anon_inodes.o
make[2]: *** [mm/dmapool.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  CC      fs/proc/inode.o
  CC      fs/notify/mark.o
  CC      fs/ext2/super.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/proc/root.o
  CC      fs/signalfd.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/drivers/net/tun.c:50:
/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/ext2/symlink.o
  CC [M]  fs/isofs/rock.o
  CC      fs/notify/vfsmount_mark.o
  CC      fs/ext3/super.o
  CC      fs/notify/dnotify/dnotify.o
  CC      fs/sysfs/symlink.o
  CC      fs/timerfd.o
make[3]: *** [net/ipv4/inetpeer.o] Error 1
  CC [M]  fs/isofs/export.o
  CC      fs/proc/base.o
make[3]: *** [net/ipv4/ip_sockglue.o] Error 1
  CC      fs/notify/inotify/inotify_fsnotify.o
make[3]: *** [net/core/gen_stats.o] Error 1
make[2]: *** [net/core] Error 2
  CC      fs/proc/generic.o
  CC      fs/notify/inotify/inotify_user.o
  CC      fs/proc/array.o
  CC      fs/eventfd.o
  CC      fs/ext3/symlink.o
  CC      fs/aio.o
  CC      fs/sysfs/mount.o
  CC      fs/ext3/hash.o
  CC      fs/locks.o
  CC [M]  fs/isofs/joliet.o
  CC      fs/binfmt_script.o
  CC      fs/sysfs/bin.o
  CC      fs/binfmt_elf.o
  CC      fs/reiserfs/bitmap.o
  CC      fs/sysfs/group.o
  CC [M]  fs/binfmt_misc.o
  CC      fs/proc/proc_tty.o
make[3]: *** [drivers/net/tun.o] Error 1
make[2]: *** [drivers/net] Error 2
  CC      fs/reiserfs/do_balan.o
  CC      fs/proc/cmdline.o
make[2]: *** [lib/kobject_uevent.o] Error 1
  CC      fs/reiserfs/namei.o
  CC      fs/proc/cpuinfo.o
  CC      fs/reiserfs/inode.o
  CC      fs/ext3/resize.o
  LD      fs/devpts/devpts.o
  CC      fs/ext3/ext3_jbd.o
  LD      fs/devpts/built-in.o
  CC      fs/proc/devices.o
  CC      fs/reiserfs/file.o
  CC      fs/proc/interrupts.o
  CC      fs/proc/loadavg.o
  CC      fs/reiserfs/dir.o
  CC      fs/reiserfs/fix_node.o
  CC      fs/reiserfs/super.o
  CC      fs/proc/meminfo.o
  CC      fs/proc/stat.o
  CC      fs/proc/uptime.o
  CC      fs/reiserfs/prints.o
  CC      fs/proc/version.o
  CC      fs/proc/softirqs.o
  CC      fs/reiserfs/objectid.o
  CC      fs/proc/proc_sysctl.o
/scratch/kisskb/src/fs/autofs4/root.c:31: warning: 'autofs4_root_compat_ioctl' declared 'static' but never defined
  LD      fs/ramfs/ramfs.o
  LD      fs/ramfs/built-in.o
  CC      fs/proc/proc_net.o
  CC      fs/proc/kcore.o
  CC      fs/reiserfs/lbalance.o
  CC      fs/reiserfs/ibalance.o
make[3]: *** [net/ipv4/tcp.o] Error 1
make[2]: *** [net/ipv4] Error 2
make[1]: *** [net] Error 2
  CC      fs/proc/kmsg.o
  CC      fs/reiserfs/stree.o
  CC      fs/reiserfs/hashes.o
  CC      fs/proc/page.o
make[1]: *** [lib] Error 2
  CC      fs/reiserfs/tail_conversion.o
  CC      fs/reiserfs/journal.o
  LD      fs/nls/built-in.o
  CC      fs/reiserfs/resize.o
  CC      fs/reiserfs/item_ops.o
  CC      fs/reiserfs/ioctl.o
make[1]: *** [ipc] Error 2
  CC      fs/reiserfs/xattr.o
  CC      fs/reiserfs/lock.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
  LD [M]  fs/autofs/autofs.o
  LD      fs/hostfs/hostfs.o
  LD      fs/hostfs/built-in.o
make[2]: *** [drivers/block] Error 2
  LD      fs/notify/dnotify/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 [M]  fs/autofs4/autofs4.o
  LD [M]  fs/isofs/isofs.o
make[1]: *** [block] Error 2
  LD      drivers/char/built-in.o
  LD      fs/sysfs/built-in.o
make[1]: *** [drivers] Error 2
  LD      fs/partitions/built-in.o
make[1]: *** [kernel] Error 2
  LD      fs/ext2/ext2.o
  LD      fs/ext2/built-in.o
  LD      fs/quota/built-in.o
make[2]: *** [fs/proc] Error 2
make[2]: *** Waiting for unfinished jobs....
  LD      fs/jbd/jbd.o
  LD      fs/jbd/built-in.o
  LD      fs/notify/inotify/built-in.o
  LD      fs/notify/built-in.o
make[1]: *** [mm] Error 2
  LD      fs/ext3/ext3.o
  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
bisect failed d7824370e26325c881b665350ce64fb0a4fde24a

# git bisect bad
Bisecting: 293 revisions left to test after this (roughly 8 steps)
[0b019a41553a919965bb02d07d54e3e6c57a796d] Merge branches 'master' and 'devel' into for-linus
# < git symbolic-ref HEAD
fatal: ref HEAD is not a symbolic ref
Traceback (most recent call last):
  File "/scratch/kisskb/prod/kisskb/kisskb3/backend/backend.py", line 151, in _do_build
    self.bisect()
  File "/scratch/kisskb/prod/kisskb/kisskb3/backend/backend.py", line 228, in bisect
    current = self.current_head_revid()
  File "/scratch/kisskb/prod/kisskb/kisskb3/backend/backend.py", line 253, in current_head_revid
    ref = call_pipe('git symbolic-ref HEAD', self.log).strip()
  File "/scratch/kisskb/prod/kisskb/kisskb3/backend/utils.py", line 32, in call_pipe
    raise CommandFailedException(cmd, p.returncode)
CommandFailedException: Failed running "git symbolic-ref HEAD" (128)