From: Andrew Morton <akpm@linux-foundation.org>
To: Nathan Chancellor <nathan@kernel.org>
Cc: Matthew Brost <matthew.brost@intel.com>,
Mark Brown <broonie@kernel.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Usama Arif <usama.arif@linux.dev>,
linux-mm@kvack.org, dri-devel@lists.freedesktop.org,
linux-next@vger.kernel.org
Subject: Re: Semantic conflict between 04b177544a04 in drm-misc-fixes and 0b6b1bb28482 in -mm
Date: Thu, 23 Jul 2026 16:09:42 -0700 [thread overview]
Message-ID: <20260723160942.b58b065d771401aba117bc77@linux-foundation.org> (raw)
In-Reply-To: <20260723212724.GA999236@ax162>
On Thu, 23 Jul 2026 14:27:24 -0700 Nathan Chancellor <nathan@kernel.org> 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 ;)
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.
next prev parent reply other threads:[~2026-07-23 23:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-22 22:56 Semantic conflict between 04b177544a04 in drm-misc-fixes and 0b6b1bb28482 in -mm Nathan Chancellor
2026-07-22 23:15 ` Matthew Brost
2026-07-23 21:27 ` Nathan Chancellor
2026-07-23 23:09 ` Andrew Morton [this message]
2026-07-23 23:11 ` Matthew Brost
2026-07-24 0:13 ` Mark Brown
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=20260723160942.b58b065d771401aba117bc77@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matthew.brost@intel.com \
--cc=mripard@kernel.org \
--cc=nathan@kernel.org \
--cc=tzimmermann@suse.de \
--cc=usama.arif@linux.dev \
/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