diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-25 18:16:47 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-25 18:16:47 +0100 |
commit | f55ac56d5ee8ef00aea9fa716625caa6ae8e9674 (patch) | |
tree | 0df9b375616ce4a0279d597f8cbe167c966f0861 /drivers/infiniband/hw/ocrdma/ocrdma_main.c | |
parent | 4208c471995f90479cd129b15cd459b4a7eaebb3 (diff) | |
parent | 05e16745c0c471bba313961b605b6da3b21a853d (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()
Diffstat (limited to 'drivers/infiniband/hw/ocrdma/ocrdma_main.c')
0 files changed, 0 insertions, 0 deletions