tree ac1c840318049539b796c9131a5e56757541672d
parent d9ef02e56f0fd3668b6d7cb17f9399ea53f12edd
parent c3fca4fb83f7c84cd1e1aa9fe3a0e220ce8f30fb
author Linus Torvalds <torvalds@linux-foundation.org> 1722633511 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1722633511 -0700
mergetag object c3fca4fb83f7c84cd1e1aa9fe3a0e220ce8f30fb
 type commit
 tag io_uring-6.11-20240802
 tagger Jens Axboe <axboe@kernel.dk> 1722612567 -0600
 
 io_uring-6.11-20240802
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmas+1sQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgpqbRD/9YlS2eql1/qSOpjOw0BpOUfBUpNRNgFZyL
 L1CqP5Jv8ivnpM/pOkLrZofWlA7fRj6BJsDxU9S2ewb0TDe2Lwfd/5xk+vWE8+ce
 1KQXT355pupf4aHbPofZ0DnShZEhy7vd9Kq9YSWqemhmGJq/2mV+txlU2bkVSz8w
 14DKBqKLJ0OH7SrTrAqjjhFGaCSXfNqj9n+het1t3Sm22YDDPvwlVPO6xFGQd84S
 +Obz/I0Ifs5p+5PRrmrKa4vj0Elh4QJ+Vp5n+fKxzuYf7InpA4kIHbOsPDLGGCkW
 LdoV3ePzlV7MBEU8FEnJE39PzhDDyehw4Tgt6cHuVnJ3vWGVgYCenF1hOX75AafM
 CN3QXwbZWbnzZTXnjbzQ9It2khRpQXRh92A7z1+i6tGYFLY+CfQLr9fCHEXbxcH+
 hvtB0gQ5YZiXGovTTsm0ODVLML8AWEOpfBDhauh+HCpvgzNYPsOZpUJG/7UNL2eE
 gDgXgbRFTPb7jq65U16mD1ux8J2eQjqXTjp51gP+duv4cOTtKxOZxAs1ssd9rWK/
 Ra6XsEZzb0e1IwiU/NdtFpsHrNzz/e6BJTuVAPkWoLuzAQYBKvnW14Mt0EUbfxTH
 rwf548uApy1X92RaCe7HcVNLFZp/2r30StEbg+G31lkaEy911fLHhIePv0vfIYxb
 Wb938OjA3w==
 =ONF/
 -----END PGP SIGNATURE-----

Merge tag 'io_uring-6.11-20240802' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:
 "Two minor tweaks for the NAPI handling, both from Olivier:

   - Kill two unused list definitions

   - Ensure that multishot NAPI doesn't age away"

* tag 'io_uring-6.11-20240802' of git://git.kernel.dk/linux:
  io_uring: remove unused local list heads in NAPI functions
  io_uring: keep multishot request NAPI timeout current