From: Linus Torvalds Date: Tue, 14 Apr 2009 17:10:53 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... X-Git-Tag: firefly_0821_release~14460 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9fc0178caa30070f65bded433f91756491a3cf26;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix possible mismatch of sufile counters on recovery nilfs2: segment usage file cleanups nilfs2: fix wrong accounting and duplicate brelse in nilfs_sufile_set_error nilfs2: simplify handling of active state of segments fix nilfs2: remove module version nilfs2: fix lockdep recursive locking warning on meta data files nilfs2: fix lockdep recursive locking warning on bmap nilfs2: return f_fsid for statfs2 --- 9fc0178caa30070f65bded433f91756491a3cf26