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 <[email protected]>
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 <[email protected]>
---
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
Hi all,
On Tue, 2 Apr 2024 11:27:46 +1100 Stephen Rothwell <[email protected]> wrote:
>
> 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 <[email protected]>
> 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 <[email protected]>
> ---
> 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
This is now a conflict between the mm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
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?