On Tue, 2024-05-14 at 09:41 +1000, Stephen Rothwell wrote: > > diff --git a/io_uring/memmap.c b/io_uring/memmap.c > > index acf5e8ca6b28..5c9e70132cd1 100644 > > --- a/io_uring/memmap.c > > +++ b/io_uring/memmap.c > > @@ -302,7 +302,7 @@ unsigned long io_uring_get_unmapped_area(struct file > > *filp, unsigned long addr, > > #else > > addr = 0UL; > > #endif > > - return current->mm->get_unmapped_area(filp, addr, len, pgoff, > > flags); > > + return mm_get_unmapped_area(current->mm, filp, addr, len, pgoff, > > flags); > > } > > > > #else /* !CONFIG_MMU */ > > -- > > 2.43.0 > > This is now a conflict between the mm-stable tree and Linus' tree. Resolution looks good to me. Andrew, do you want me to do anything here?
