| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 16 Jun 2018 07:11:40 +0000 (16:11 +0900) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 16 Jun 2018 07:11:40 +0000 (16:11 +0900) | ||
| commit | a5b729ea18ae601e7aea329e41052bbb861114bd | |
| tree | 5b4a1238fb005e1b48bea893c0827ebb4271c99c | tree | snapshot (tar.xz tar.gz zip) |
| parent | 9215310cf13bccfe777500986d562d53bdb63537 | commit | diff |
| parent | 11c5ad0ec441129adef42c16bbd5139707a8c5b6 | commit | diff |
Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull aio fixes from Al Viro:
"Assorted AIO followups and fixes"
* 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
eventpoll: switch to ->poll_mask
aio: only return events requested in poll_mask() for IOCB_CMD_POLL
eventfd: only return events requested in poll_mask()
aio: mark __aio_sigset::sigmask const
Pull aio fixes from Al Viro:
"Assorted AIO followups and fixes"
* 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
eventpoll: switch to ->poll_mask
aio: only return events requested in poll_mask() for IOCB_CMD_POLL
eventfd: only return events requested in poll_mask()
aio: mark __aio_sigset::sigmask const