Commit 49dc6671 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge fb348857 ("io_uring: ensure IOPOLL locks around deferred work") into android13-5.15-lts 



Steps on the way to 5.15.121

Resolves merge conflicts in:
	drivers/char/hw_random/virtio-rng.c

Change-Id: Ib59e8cd3275125cf9b54881536bc371c0e686acf
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 629a0102 fb348857
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment