diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-18 19:25:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-18 19:25:27 +0300 |
| commit | 38eddeedbbeac33f26845c29e7414b9313ea70db (patch) | |
| tree | 3643297470fe54049212ba3c69a0ae4214cf65d3 /include | |
| parent | a335366bad1364a07f49df9da1fdfa6d411a5f39 (diff) | |
| parent | 9bd3f728223ebcfef8e9d087bdd142f0e388215d (diff) | |
| download | linux-38eddeedbbeac33f26845c29e7414b9313ea70db.tar.xz | |
Merge tag 'io_uring-6.0-2022-09-18' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe:
"Nothing really major here, but figured it'd be nicer to just get these
flushed out for -rc6 so that the 6.1 branch will have them as well.
That'll make our lives easier going forward in terms of development,
and avoid trivial conflicts in this area.
- Simple trace rename so that the returned opcode name is consistent
with the enum definition (Stefan)
- Send zc rsrc request vs notification lifetime fix (Pavel)"
* tag 'io_uring-6.0-2022-09-18' of git://git.kernel.dk/linux:
io_uring/opdef: rename SENDZC_NOTIF to SEND_ZC
io_uring/net: fix zc fixed buf lifetime
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions