Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> writes:
> On Wed, 11 Sep 2024 09:06:53 +0800 "Huang, Ying" <ying.huang@xxxxxxxxx> wrote:
>
>> > linux-next?) requires the presence of ea72ce5da228 ("x86/kaslr: Expose
>> > and use the end of the physical memory address space"), which is not
>> > present in mm.git. Yet mm.git exhibits the build failure.
>>
>> The original test report is against linux-next tree instead mm tree.
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
>>
>> The first bad commit (bisection result) is:
>>
>> 5f445800cbdfc4b4185d496a43dfd78df63d2265 [10352/10516] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>>
>> That is, mm tree is merged in linux-next, and commit ea72ce5da228
>> ("x86/kaslr: Expose and use the end of the physical memory address
>> space") is merged in linux-next too. In fact, there's a merge conflict
>> for MAX_PHYSMEM_BITS related code. Maybe this can be part of merge
>> conflict resolving patch?
>>
>> Hi, Stephen,
>>
>> Can you use the patch above as part of merged conflict resolving patch
>> for patch
>>
>> e2941fe697c8 ("resource, kunit: add test case for region_intersects()")
>>
>> You have resolved it in
>>
>> https://lore.kernel.org/lkml/20240909100043.60668995@xxxxxxxxxxxxxxxx/
>
> mm-unstable is presently broken, and fixing up linux-next won't change that.
>
> I'd prefer to fix mm-stable and then provide Linus directions for merging that
> with the x86 tree.
The real bug fix patch is [1/3]:
resource: Fix region_intersects() vs add_memory_driver_managed()
The merge conflict is for the new kunit test case, which isn't urgent.
So, another option is to merge the bug fix ([1/3]) through mm now and
backport it to stable kernels. Then I can resend the kunit test case
after v6.12-rc1 is released.
--
Best Regards,
Huang, Ying
