tree 9274243e8d62427be5b7ec15bc9cd383e482f477
parent 57eccf1c2acae2fcb748730881ba75643fc31c81
parent f766619db2be059cd0dbba8a36176fe01a29d588
author Linus Torvalds <torvalds@linux-foundation.org> 1326236941 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326236941 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  fs/9p: iattr_valid flags are kernel internal flags map them to 9p values.
  fs/9p: We should not allocate a new inode when creating hardlines.
  fs/9p: v9fs_stat2inode should update suid/sgid bits.
  9p: Reduce object size with CONFIG_NET_9P_DEBUG
  fs/9p: check schedule_timeout_interruptible return value

Fix up trivial conflicts in fs/9p/{vfs_inode.c,vfs_inode_dotl.c} due to
debug messages having changed to use p9_debug() on one hand, and the
changes for umode_t on the other.