From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Andrew Morton <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rick Edgecombe <rick.p.edgecombe@intel.com>
Subject: linux-next: manual merge of the block tree with the mm tree
Date: Tue, 2 Apr 2024 11:27:46 +1100 [thread overview]
Message-ID: <20240402112746.3864d8a6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1720 bytes --]
Hi all,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the block tree got a conflict in:
io_uring/io_uring.c
between commit:
d3329b3a9d72 ("mm: switch mm->get_unmapped_area() to a flag")
from the mm-unstable branhc of the mm tree and commit:
624d801ce45b ("io_uring: move mapping/allocation helpers to a separate file")
from the block tree.
I fixed it up (I used the latter version of this file and applied the
following merge fix patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Apr 2024 11:25:46 +1100
Subject: [PATCH] fix up for "mm: switch mm->get_unmapped_area() to a flag"
from the mm tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
io_uring/memmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-04-02 0:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 0:27 Stephen Rothwell [this message]
2024-05-13 23:41 ` linux-next: manual merge of the block tree with the mm tree Stephen Rothwell
2024-05-13 23:43 ` Edgecombe, Rick P
-- 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:49 ` Jens Axboe
2023-03-23 0:04 ` David Howells
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=20240402112746.3864d8a6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rick.p.edgecombe@intel.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).