2013-01-18_12_17_42

From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
 * branch            master     -> FETCH_HEAD
Already up-to-date.

commit 142a562568708db04dd5e4f4c060f26e442514c8
Merge: 5fc0a84 7d1f9ae
Author: Michal Simek <monstr@monstr.eu>
Date:   Fri Jan 18 12:00:54 2013 +0100

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

  CLEAN   scripts/basic
  CLEAN   scripts/kconfig
  CLEAN   include/config

#
# configuration written to .config
#

scripts/kconfig/conf --silentoldconfig Kconfig
  CHK     include/generated/uapi/linux/version.h
  CC      scripts/mod/empty.o
  CHK     include/generated/utsrelease.h
  MKELF   scripts/mod/elfconfig.h
  HOSTCC  scripts/mod/file2alias.o
  CC      kernel/bounds.s
  GEN     include/generated/bounds.h
  CC      arch/microblaze/kernel/asm-offsets.s
  GEN     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  HOSTCC  scripts/mod/modpost.o
  HOSTCC  scripts/mod/sumversion.o
  HOSTLD  scripts/mod/modpost
  GEN     usr/initramfs_data.cpio.gz
  CC      init/main.o
  CHK     include/generated/compile.h
  CC      init/do_mounts.o
  AS      usr/initramfs_data.o
  LD      usr/built-in.o
  CC      arch/microblaze/kernel/dma.o
  CC      arch/microblaze/kernel/exceptions.o
  CC      init/do_mounts_rd.o
  AS      arch/microblaze/kernel/hw_exception_handler.o
  CC      arch/microblaze/kernel/intc.o
  CC      arch/microblaze/kernel/irq.o
  CC      init/do_mounts_initrd.o
  CC      arch/microblaze/kernel/process.o
  CC      init/initramfs.o
  CC      arch/microblaze/kernel/prom.o
  CC      arch/microblaze/kernel/prom_parse.o
  CC      init/calibrate.o
  CC      init/init_task.o
  CC      arch/microblaze/kernel/ptrace.o
  CC      init/version.o
  CC      arch/microblaze/kernel/reset.o
  LD      init/mounts.o
  LD      init/built-in.o
  CC      arch/microblaze/mm/consistent.o
  CC      arch/microblaze/kernel/setup.o
  CC      arch/microblaze/mm/init.o
  CC      arch/microblaze/mm/pgtable.o
  CC      arch/microblaze/kernel/sys_microblaze.o
  CC      arch/microblaze/mm/mmu_context.o
  CC      arch/microblaze/kernel/timer.o
  CC      arch/microblaze/kernel/traps.o
  CC      arch/microblaze/mm/fault.o
  CC      arch/microblaze/kernel/unwind.o
  LD      arch/microblaze/mm/built-in.o
  CC      arch/microblaze/kernel/cpu/cache.o
  CC      arch/microblaze/kernel/cpu/cpuinfo.o
  CC      arch/microblaze/kernel/early_printk.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-pvr-full.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-static.o
  CC      arch/microblaze/kernel/cpu/mb.o
  CC      arch/microblaze/kernel/microblaze_ksyms.o
  CC      arch/microblaze/kernel/cpu/pvr.o
  LD      arch/microblaze/kernel/cpu/built-in.o
  CC      arch/microblaze/kernel/module.o
  CC      arch/microblaze/platform/platform.o
  AS      arch/microblaze/kernel/misc.o
  LD      arch/microblaze/platform/built-in.o
  AS      arch/microblaze/kernel/entry.o
  AS      arch/microblaze/kernel/head.o
  LDS     arch/microblaze/kernel/vmlinux.lds
  LD      arch/microblaze/kernel/built-in.o
  CC      kernel/fork.o
  CC      kernel/exec_domain.o
  CC      mm/filemap.o
  CC      kernel/panic.o
  CC      kernel/printk.o
  CC      mm/mempool.o
  CC      mm/oom_kill.o
  CC      kernel/cpu.o
  CC      mm/fadvise.o
  CC      kernel/exit.o
  CC      mm/maccess.o
  CC      mm/page_alloc.o
  CC      kernel/itimer.o
  CC      kernel/time.o
  CC      kernel/softirq.o
  CC      mm/page-writeback.o
  CC      kernel/resource.o
  CC      kernel/sysctl.o
  CC      mm/readahead.o
  CC      mm/swap.o
  CC      kernel/sysctl_binary.o
  CC      kernel/capability.o
  CC      mm/truncate.o
  CC      kernel/ptrace.o
  CC      mm/vmscan.o
  CC      kernel/timer.o
  CC      kernel/user.o
  CC      kernel/signal.o
  CC      mm/shmem.o
  CC      mm/util.o
  CC      mm/mmzone.o
  CC      mm/vmstat.o
  CC      mm/backing-dev.o
  CC      kernel/sys.o
  CC      mm/mm_init.o
  CC      mm/mmu_context.o
  CC      kernel/kmod.o
  CC      mm/percpu.o
  CC      kernel/workqueue.o
  CC      mm/slab_common.o
  CC      mm/compaction.o
  CC      kernel/pid.o
  CC      mm/balloon_compaction.o
  CC      kernel/task_work.o
  CC      mm/interval_tree.o
  CC      kernel/rcupdate.o
  CC      kernel/extable.o
  CC      mm/fremap.o
  CC      kernel/params.o
  CC      mm/highmem.o
  CC      kernel/posix-timers.o
  CC      mm/madvise.o
  CC      mm/memory.o
  CC      kernel/kthread.o
  CC      kernel/wait.o
  CC      kernel/kfifo.o
  CC      kernel/sys_ni.o
  CC      kernel/posix-cpu-timers.o
  CC      mm/mincore.o
  CC      mm/mlock.o
  CC      kernel/hrtimer.o
  CC      mm/mmap.o
  CC      fs/debugfs/file.o
  CC      ipc/shm.o
  LD      fs/debugfs/debugfs.o
  LD      fs/debugfs/built-in.o
  CC      fs/devpts/inode.o
  CC      ipc/ipcns_notifier.o
  LD      fs/devpts/devpts.o
  LD      fs/devpts/built-in.o
  LD      fs/exofs/built-in.o
  CC      fs/ext2/balloc.o
  CC      ipc/syscall.o
  CC      ipc/ipc_sysctl.o
  CC      ipc/mqueue.o
ipc/mqueue.c: In function 'mqueue_get_inode':
ipc/mqueue.c:282: error: 'struct user_struct' has no member named 'mq_bytes'
ipc/mqueue.c:282: error: 'struct user_struct' has no member named 'mq_bytes'
ipc/mqueue.c:283: error: 'struct user_struct' has no member named 'mq_bytes'
ipc/mqueue.c:289: error: 'struct user_struct' has no member named 'mq_bytes'
ipc/mqueue.c: In function 'mqueue_evict_inode':
ipc/mqueue.c:398: error: 'struct user_struct' has no member named 'mq_bytes'
ipc/mqueue.c: In function 'mqueue_create':
ipc/mqueue.c:428: error: 'HARD_QUEUESMAX' undeclared (first use in this function)
ipc/mqueue.c:428: error: (Each undeclared identifier is reported only once
ipc/mqueue.c:428: error: for each function it appears in.)
ipc/mqueue.c: In function 'mq_attr_ok':
ipc/mqueue.c:700: error: 'HARD_MSGMAX' undeclared (first use in this function)
ipc/mqueue.c:701: error: 'HARD_MSGSIZEMAX' undeclared (first use in this function)
ipc/mqueue.c: At top level:
ipc/mqueue.c:1389: error: redefinition of 'mq_init_ns'
include/linux/ipc_namespace.h:134: error: previous definition of 'mq_init_ns' was here
ipc/mqueue.c: In function 'mq_init_ns':
ipc/mqueue.c:1391: error: 'DFLT_QUEUESMAX' undeclared (first use in this function)
ipc/mqueue.c:1392: error: 'DFLT_MSGMAX' undeclared (first use in this function)
ipc/mqueue.c:1393: error: 'DFLT_MSGSIZEMAX' undeclared (first use in this function)
ipc/mqueue.c:1394: error: 'DFLT_MSG' undeclared (first use in this function)
ipc/mqueue.c:1395: error: 'DFLT_MSGSIZE' undeclared (first use in this function)
ipc/mqueue.c: At top level:
ipc/mqueue.c:1407: error: redefinition of 'mq_clear_sbinfo'
ipc/util.h:28: error: previous definition of 'mq_clear_sbinfo' was here
ipc/mqueue.c:1412: error: redefinition of 'mq_put_mnt'
ipc/util.h:29: error: previous definition of 'mq_put_mnt' was here
make[1]: *** [ipc/mqueue.o] Error 1
make: *** [ipc] Error 2
make: *** Waiting for unfinished jobs....
  CC      fs/lockd/clntlock.o
  CC      fs/ext2/file.o
  CC      fs/lockd/clntproc.o
  CC      fs/ext2/ialloc.o
  CC      fs/ext2/inode.o
  CC      fs/lockd/clntxdr.o
  CC      fs/lockd/host.o
  CC      fs/ext2/ioctl.o
  CC      fs/ext2/namei.o
  CC      fs/lockd/svc.o
  CC      fs/ext2/super.o
  CC      fs/lockd/svclock.o
  CC      fs/ext2/symlink.o
  CC      fs/lockd/svcshare.o
  LD      fs/ext2/ext2.o
  LD      fs/ext2/built-in.o
  CC      fs/lockd/svcproc.o
  CC      fs/lockd/svcsubs.o
  CC      fs/lockd/mon.o
  CC      fs/lockd/xdr.o
  CC      fs/nfs/dir.o
  CC      fs/lockd/grace.o
  CC      fs/lockd/clnt4xdr.o
  CC      fs/nfs/file.o
  CC      fs/lockd/xdr4.o
  CC      fs/nfs/getroot.o
  CC      fs/lockd/svc4proc.o
  CC      fs/nfs/inode.o
  LD      fs/lockd/lockd.o
  LD      fs/lockd/built-in.o
  LD      fs/nfs_common/built-in.o
  CC      fs/notify/fsnotify.o
  CC      fs/notify/notification.o
  CC      fs/notify/group.o
  CC      fs/nfs/super.o
  CC      fs/notify/inode_mark.o
  CC      fs/notify/mark.o
  CC      fs/notify/vfsmount_mark.o
  CC      fs/nfs/direct.o
  CC      fs/notify/fdinfo.o
  LD      fs/notify/dnotify/built-in.o
  LD      fs/notify/fanotify/built-in.o
  CC      fs/notify/inotify/inotify_fsnotify.o
  CC      fs/notify/inotify/inotify_user.o
  CC      fs/nfs/pagelist.o
  LD      fs/notify/inotify/built-in.o
  LD      fs/notify/built-in.o
  CC      fs/proc/mmu.o
  CC      fs/proc/task_mmu.o
  CC      fs/nfs/read.o
  CC      fs/proc/inode.o
  CC      fs/nfs/symlink.o
  CC      fs/proc/root.o
  CC      fs/proc/base.o
  CC      fs/nfs/unlink.o
  CC      fs/nfs/write.o
  CC      fs/proc/generic.o
  CC      fs/proc/array.o
  CC      fs/proc/proc_tty.o
  CC      fs/nfs/namespace.o
  CC      fs/proc/fd.o
  CC      fs/nfs/mount_clnt.o
  CC      fs/proc/cmdline.o
  CC      fs/proc/consoles.o
  CC      fs/proc/cpuinfo.o
  CC      fs/nfs/dns_resolve.o
  CC      fs/proc/devices.o
  CC      fs/proc/interrupts.o
  CC      fs/proc/loadavg.o
  CC      fs/nfs/cache_lib.o
  CC      fs/proc/meminfo.o
  CC      fs/nfs/sysctl.o
  CC      fs/proc/stat.o
  CC      fs/proc/uptime.o
  CC      fs/nfs/nfs2super.o
  CC      fs/proc/version.o
  CC      fs/nfs/proc.o
  CC      fs/proc/namespaces.o
  CC      fs/proc/self.o
  CC      fs/nfs/nfs2xdr.o
  CC      fs/proc/proc_sysctl.o
  CC      fs/nfs/nfs3super.o
  CC      fs/proc/proc_net.o
  CC      fs/nfs/nfs3client.o
  CC      fs/proc/proc_devtree.o
  CC      fs/proc/kmsg.o
  CC      fs/nfs/nfs3proc.o
  CC      fs/proc/page.o
  LD      fs/proc/proc.o
  LD      fs/proc/built-in.o
  LD      fs/quota/built-in.o
  CC      fs/ramfs/inode.o
  CC      fs/nfs/nfs3xdr.o
  CC      fs/ramfs/file-mmu.o
  LD      fs/ramfs/ramfs.o
  LD      fs/ramfs/built-in.o
  LD      fs/romfs/built-in.o
  CC      fs/sysfs/inode.o
  CC      fs/sysfs/file.o
  LD      fs/nfs/nfs.o
  LD      fs/nfs/nfsv2.o
  LD      fs/nfs/nfsv3.o
  LD      fs/nfs/built-in.o
  CC      fs/eventpoll.o
  CC      fs/sysfs/dir.o
fs/eventpoll.c: In function 'ep_remove': fs/eventpoll.c:676: error: 'struct user_struct' has no member named 'epoll_watches'
fs/eventpoll.c: In function 'eventpoll_release_file':
fs/eventpoll.c:828: error: 'struct file' has no member named 'f_ep_links'
fs/eventpoll.c: In function 'reverse_path_check_proc':
fs/eventpoll.c:1094: error: 'struct file' has no member named 'f_ep_links'
fs/eventpoll.c:1094: error: 'struct file' has no member named 'f_ep_links'
fs/eventpoll.c:1097: error: 'struct file' has no member named 'f_ep_links'
fs/eventpoll.c: In function 'reverse_path_check':
fs/eventpoll.c:1135: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c:1135: warning: type defaults to 'int' in declaration of '__mptr'
fs/eventpoll.c:1135: warning: initialization from incompatible pointer type
fs/eventpoll.c:1135: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c:1135: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c:1135: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c:1135: warning: type defaults to 'int' in declaration of '__mptr'
fs/eventpoll.c:1135: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c:1135: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c: In function 'ep_insert':
fs/eventpoll.c:1182: error: 'struct user_struct' has no member named 'epoll_watches'
fs/eventpoll.c:1230: error: 'struct file' has no member named 'f_ep_links'
fs/eventpoll.c:1261: error: 'struct user_struct' has no member named 'epoll_watches'
fs/eventpoll.c: In function 'ep_loop_check_proc':
fs/eventpoll.c:1620: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c:1621: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c: In function 'clear_tfile_check_list':
fs/eventpoll.c:1663: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c:1663: warning: type defaults to 'int' in declaration of '__mptr'
fs/eventpoll.c:1663: warning: initialization from incompatible pointer type
fs/eventpoll.c:1663: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c:1665: error: 'struct file' has no member named 'f_tfile_llink'
fs/eventpoll.c: In function 'sys_epoll_ctl':
fs/eventpoll.c:1803: error: 'struct file' has no member named 'f_tfile_llink'
make[1]: *** [fs/eventpoll.o] Error 1
make[1]: *** Waiting for unfinished jobs....
  CC      fs/sysfs/mount.o
  CC      fs/sysfs/bin.o
  CC      fs/sysfs/group.o
  LD      fs/sysfs/built-in.o
make: *** [fs] Error 2

Checking out files:  36% (1629/4506)   
Checking out files:  37% (1668/4506)   
Checking out files:  38% (1713/4506)   
Checking out files:  39% (1758/4506)   
Checking out files:  40% (1803/4506)   
Checking out files:  41% (1848/4506)   
Checking out files:  42% (1893/4506)   
Checking out files:  43% (1938/4506)   
Checking out files:  44% (1983/4506)   
Checking out files:  45% (2028/4506)   
Checking out files:  46% (2073/4506)   
Checking out files:  47% (2118/4506)   
Checking out files:  48% (2163/4506)   
Checking out files:  49% (2208/4506)   
Checking out files:  50% (2253/4506)   
Checking out files:  51% (2299/4506)   
Checking out files:  52% (2344/4506)   
Checking out files:  53% (2389/4506)   
Checking out files:  54% (2434/4506)   
Checking out files:  55% (2479/4506)   
Checking out files:  56% (2524/4506)   
Checking out files:  57% (2569/4506)   
Checking out files:  58% (2614/4506)   
Checking out files:  59% (2659/4506)   
Checking out files:  60% (2704/4506)   
Checking out files:  61% (2749/4506)   
Checking out files:  62% (2794/4506)   
Checking out files:  63% (2839/4506)   
Checking out files:  64% (2884/4506)   
Checking out files:  65% (2929/4506)   
Checking out files:  66% (2974/4506)   
Checking out files:  67% (3020/4506)   
Checking out files:  68% (3065/4506)   
Checking out files:  69% (3110/4506)   
Checking out files:  70% (3155/4506)   
Checking out files:  71% (3200/4506)   
Checking out files:  72% (3245/4506)   
Checking out files:  73% (3290/4506)   
Checking out files:  74% (3335/4506)   
Checking out files:  75% (3380/4506)   
Checking out files:  75% (3421/4506)   
Checking out files:  76% (3425/4506)   
Checking out files:  77% (3470/4506)   
Checking out files:  78% (3515/4506)   
Checking out files:  79% (3560/4506)   
Checking out files:  80% (3605/4506)   
Checking out files:  81% (3650/4506)   
Checking out files:  82% (3695/4506)   
Checking out files:  83% (3740/4506)   
Checking out files:  84% (3786/4506)   
Checking out files:  85% (3831/4506)   
Checking out files:  86% (3876/4506)   
Checking out files:  87% (3921/4506)   
Checking out files:  88% (3966/4506)   
Checking out files:  89% (4011/4506)   
Checking out files:  90% (4056/4506)   
Checking out files:  91% (4101/4506)   
Checking out files:  92% (4146/4506)   
Checking out files:  93% (4191/4506)   
Checking out files:  94% (4236/4506)   
Checking out files:  95% (4281/4506)   
Checking out files:  96% (4326/4506)   
Checking out files:  97% (4371/4506)   
Checking out files:  98% (4416/4506)   
Checking out files:  99% (4461/4506)   
Checking out files: 100% (4506/4506)   
Checking out files: 100% (4506/4506), done.
Switched to branch 'master'
Deleted branch next (was d25b83b).
From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
 * branch            master     -> FETCH_HEAD
Already up-to-date.
From ../linux-2.6
 * branch            HEAD       -> FETCH_HEAD
Already up-to-date.
Fetching origin
Fetching linux-next
Switched to a new branch 'next'
Branch next set up to track remote branch master from linux-next.

commit d25b83b25dea6d2f350dbfbc8537ff0e44e76ac4
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Fri Jan 18 15:26:01 2013 +1100

    Add linux-next specific files for 20130118
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

  CLEAN   kernel
  CLEAN   usr
  CLEAN   .tmp_versions
  CLEAN   scripts/basic
  CLEAN   scripts/dtc
  CLEAN   scripts/kconfig
  CLEAN   scripts/mod
  CLEAN   scripts
  CLEAN   include/config include/generated arch/microblaze/include/generated
  CLEAN   .config .version include/generated/uapi/linux/version.h

  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  SHIPPED scripts/kconfig/zconf.tab.c
  SHIPPED scripts/kconfig/zconf.lex.c
  SHIPPED scripts/kconfig/zconf.hash.c
  HOSTCC  scripts/kconfig/zconf.tab.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#