diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-20 13:13:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-20 13:13:59 -0800 |
| commit | e37b12e4bb21e7c81732370b0a2b34bd196f380b (patch) | |
| tree | 7f0894d73040ed9a5e5a1f3fade9938cf3142a75 /fs/9p/vfs_file.c | |
| parent | Merge tag '5.11-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | orangefs: add splice file operations (diff) | |
| download | linux-dev-e37b12e4bb21e7c81732370b0a2b34bd196f380b.tar.xz linux-dev-e37b12e4bb21e7c81732370b0a2b34bd196f380b.zip | |
Merge tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs update from Mike Marshall:
"Add splice file operations"
* tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: add splice file operations
Diffstat (limited to 'fs/9p/vfs_file.c')
0 files changed, 0 insertions, 0 deletions