From: Linus Torvalds Date: Fri, 25 Oct 2013 17:16:47 +0000 (+0100) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs X-Git-Tag: firefly_0821_release~176^2~5106 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f55ac56d5ee8ef00aea9fa716625caa6ae8e9674;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs Pull vfs fixes (try two) from Al Viro: "nfsd performance regression fix + seq_file lseek(2) fix" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: seq_file: always update file->f_pos in seq_lseek() nfsd regression since delayed fput() --- f55ac56d5ee8ef00aea9fa716625caa6ae8e9674