summaryrefslogtreecommitdiff
path: root/scripts/git-resolve.sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-08-22 09:25:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2025-08-22 09:25:59 -0400
commitd28de4fc0aaa8db6c0163e37c6d4d07f062a08db (patch)
treecd21c5319c6db62c291b07dfbb1a86971c9f0ac1 /scripts/git-resolve.sh
parentedeee68c42747c9d9b237f06fbc4cd1a2348fefb (diff)
parente4e6aaea46b7be818eba0510ba68d30df8689ea3 (diff)
Merge tag 'io_uring-6.17-20250822' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe: "Just two small fixes - one that fixes inconsistent ->async_data vs REQ_F_ASYNC_DATA handling in futex, and a followup that just ensures that if other opcode handlers mess this up, it won't cause any issues" * tag 'io_uring-6.17-20250822' of git://git.kernel.dk/linux: io_uring: clear ->async_data as part of normal init io_uring/futex: ensure io_futex_wait() cleans up properly on failure
Diffstat (limited to 'scripts/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions