linux-kernel - Re: linux-next: manual merge of the block tree with the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date: Mon, 13 May 2024 23:43:08 +0000
From: "Edgecombe, Rick P" <rick.p.edgecombe@...el.com>
To: "sfr@...b.auug.org.au" <sfr@...b.auug.org.au>, "akpm@...ux-foundation.org"
	<akpm@...ux-foundation.org>
CC: "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"axboe@...nel.dk" <axboe@...nel.dk>, "linux-kernel@...r.kernel.org"
	<linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the mm tree

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?