diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 20:56:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 20:56:23 -0700 |
| commit | f2be269897708700ed9b2a96f695348a10a003e8 (patch) | |
| tree | 74f0a1d5780dd53a71966fbe5d30a0bb0b361d12 /fs/dcache.c | |
| parent | 4d2a073cde825dd1a0ce8ff8b6aef138997fbbd9 (diff) | |
| parent | e8693bcfa0b4a56268946f0756153d942cb66cf7 (diff) | |
Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs aio updates from Al Viro:
"Christoph's aio poll, saner this time around.
This time it's pretty much local to fs/aio.c. Hopefully race-free..."
* 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
aio: allow direct aio poll comletions for keyed wakeups
aio: implement IOCB_CMD_POLL
aio: add a iocb refcount
timerfd: add support for keyed wakeups
Diffstat (limited to 'fs/dcache.c')
0 files changed, 0 insertions, 0 deletions