git.maquefel.me Git - linux.git/commit

Merge branch 'vfs-scale-working' of git://git./linux/kernel/git/npiggin/linux-npiggin

* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin:
  fs: fix do_last error case when need_reval_dot
  nfs: add missing rcu-walk check
  fs: hlist UP debug fixup
  fs: fix dropping of rcu-walk from force_reval_path
  fs: force_reval_path drop rcu-walk before d_invalidate
  fs: small rcu-walk documentation fixes

Fixed up trivial conflicts in Documentation/filesystems/porting

author	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 14 Jan 2011 04:14:13 +0000 (20:14 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 14 Jan 2011 04:14:13 +0000 (20:14 -0800)
commit	db9effe99adc67c53e6aedadadd2aa9a02342e48
tree	efe7ebfe951972568189ef2548130f0abd515210	tree \| snapshot
parent	9c4bc1c2befbbdce4b9fd526e67a7a2ea143ffa2	commit \| diff
parent	f20877d94a74557b7c28b4ed8920d834c31e0ea5	commit \| diff

Documentation/filesystems/porting	diff1 \|	diff2 \|	blob \| history
fs/namei.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/dir.c	diff1 \|	diff2 \|	blob \| history