| commit | ceb804cd0f63b0e0a87b81913b66add6de03043d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 14 11:11:08 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 14 11:11:08 2010 -0700 |
| tree | 179d3050a8ea5fe5b8406efec64b5c391499d4d4 | |
| parent | 3474cbd11df8cdd6413781ea95bd51dd469098ff [diff] | |
| parent | f78233dd44a110c574fe760ad6f9c1e8741a0d00 [diff] |
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: 9p: Skip check for mandatory locks when unlocking 9p: Fixes a simple bug enabling writes beyond 2GB. 9p: Change the name of new protocol from 9p2010.L to 9p2000.L fs/9p: re-init the wstat in readdir loop net/9p: Add sysfs mount_tag file for virtio 9P device net/9p: Use the tag name in the config space for identifying mount point