Re: linux-next: manual merge of the mm tree with Linus' tree

Huang, Ying
2024-09-09T01:57:33Z

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the mm tree got a conflict in:
>
> kernel/resource.c
>
> between commit:
>
> ea72ce5da228 ("x86/kaslr: Expose and use the end of the physical memory address space")
>
> from Linus' tree and commit:
>
> e2941fe697c8 ("resource, kunit: add test case for region_intersects()")
>
> from the mm-unstable branch of the mm tree.
>
> I fixed it up (I just used the former - and see below) 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.

The fix looks good to me. Thanks for your help!

--
Best Regards,
Huang, Ying