Re: Semantic conflict between 04b177544a04 in drm-misc-fixes and 0b6b1bb28482 in -mm

On Thu, Jul 23, 2026 at 04:09:42PM -0700, Andrew Morton wrote:
> On Thu, 23 Jul 2026 14:27:24 -0700 Nathan Chancellor <[email protected]> wrote:
> 
> > > So the drm_pagemap.c code could be:
> > > 
> > > -#if IS_ENABLED(CONFIG_ARCH_ENABLE_THP_MIGRATION)
> > > +#if IS_ENABLED(CONFIG_PGTABLE_HAS_HUGE_LEAVES)
> > > #define DRM_PAGEMAP_PMD_ORDER        HPAGE_PMD_ORDER
> > > #else
> > > #define DRM_PAGEMAP_PMD_ORDER        (-1)
> > 
> > Ah yeah, I probably should have looked at the bigger picture there.
> > 
> > > This Kconfig has been around since 2024:
> > > git format-patch -1 b979db1611a63
> > > 
> > > Would it be better for everyone for me to change this in the DRM branches?
> > 
> > I believe that would render this conflict moot and seems like the
> > correct thing to do anyways but you could wait for input from the mm
> > folks.
> 
> I'm fine the drm people changing things ;)
> 

I'll jump make a DRM change so this is all worked out when it gets to
Linus.

Matt

> Otherwise I can disable "mm: rename ARCH_ENABLE_THP_MIGRATION to
> ARCH_HAS_PMD_SOFTLEAVES" for now and fix&reintroduce it into mm.git
> after drm-misc has merge into Linus.  Or something like that.
>