diff options
author | Linus Torvalds | 2019-11-21 11:51:49 -0800 |
---|---|---|
committer | Linus Torvalds | 2019-11-21 11:51:49 -0800 |
commit | d324810acded7003c955c7c6faf4c57cd40e6000 (patch) | |
tree | 5cb56bd3ca47f362367a242f99abd413211c0912 /tools/io_uring | |
parent | c74386d50fbaf4a54fd3fe560f1abc709c0cff4b (diff) | |
parent | 9e77716a75bc6cf54965e5ec069ba7c02b32251c (diff) |
Merge tag 'for-linus-2019-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux
Pull pidfd fixlet from Christian Brauner:
"This contains a simple fix for the pidfd poll method. In the original
patchset pidfd_poll() was made to return an unsigned int. However, the
poll method is defined to return a __poll_t. While the unsigned int is
not a huge deal it's just nicer to return a __poll_t.
I've decided to send it right before the 5.4 release mainly so that
stable doesn't need to backport it to both 5.4 and 5.3"
* tag 'for-linus-2019-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
fork: fix pidfd_poll()'s return type
Diffstat (limited to 'tools/io_uring')
0 files changed, 0 insertions, 0 deletions