Commit 6e54d272 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 46b1b3d8 ("io_uring/kbuf: use vm_insert_pages() for mmap'ed pbuf... 


Merge 46b1b3d8 ("io_uring/kbuf: use vm_insert_pages() for mmap'ed pbuf ring") into android15-6.6-lts

Steps on the way to 6.6.84

Resolves merge conflict in:
	io_uring/io_uring.c

Change-Id: I3d90f6864758dbeb9667f9da496e3737f685c927
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 82f1bb9a 46b1b3d8
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