From: "Edgecombe, Rick P" <rick.p.edgecombe@intel.com>
To: "sfr@canb.auug.org.au" <sfr@canb.auug.org.au>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"axboe@kernel.dk" <axboe@kernel.dk>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the mm tree
Date: Mon, 13 May 2024 23:43:08 +0000 [thread overview]
Message-ID: <ea742b61053b3343485efa7e362839de6d677707.camel@intel.com> (raw)
In-Reply-To: <20240514094120.0ae75f3a@canb.auug.org.au>
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?
next prev parent reply other threads:[~2024-05-13 23:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 0:27 linux-next: manual merge of the block tree with the mm tree Stephen Rothwell
2024-05-13 23:41 ` Stephen Rothwell
2024-05-13 23:43 ` Edgecombe, Rick P [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-14 0:25 Stephen Rothwell
2024-03-11 21:54 ` Stephen Rothwell
2023-06-16 1:58 Stephen Rothwell
2023-06-16 3:50 ` Andrew Morton
2023-06-16 9:56 ` David Howells
2023-06-16 16:07 ` Jens Axboe
2023-06-16 19:44 ` Vishal Moola
2023-06-16 1:50 Stephen Rothwell
2023-03-22 23:02 Stephen Rothwell
2023-03-22 23:13 ` David Howells
2023-03-22 23:15 ` Jens Axboe
2023-03-22 23:26 ` Andrew Morton
2023-03-23 0:03 ` Stephen Rothwell
2023-03-23 0:04 ` David Howells
2023-03-23 0:49 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ea742b61053b3343485efa7e362839de6d677707.camel@intel.com \
--to=rick.p.edgecombe@intel.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox