Commit 2ccdc4d5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 2905c4fe ("io_uring: get rid of remap_pfn_range() for mapping... 


Merge 2905c4fe ("io_uring: get rid of remap_pfn_range() for mapping rings/sqes") into android15-6.6-lts

Steps on the way to 6.6.84

Resolves merge conflicts in:
	io_uring/io_uring.c

Change-Id: Idccf8ba3dde71c022896adc8b0aac57249d68779
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a41ceb1f 2905c4fe
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