]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d080fa bcc87d9)
Merge tag 'io_uring-6.11-20240722' of git://git.kernel.dk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Jul 2024 18:45:48 +0000 (11:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Jul 2024 18:45:48 +0000 (11:45 -0700)
Pull io_uring fixes from Jens Axboe:
 "Two minor fixes in here, both heading to stable. In detail:

   - Fix error where forced async uring_cmd getsockopt returns the wrong
     value on execution, leading to it never being completed (Pavel)

   - Fix io_alloc_pbuf_ring() using a NULL check rather than IS_ERR
     (Pavel)"

* tag 'io_uring-6.11-20240722' of git://git.kernel.dk/linux:
  io_uring: fix error pbuf checking
  io_uring: fix lost getsockopt completions


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.