From: Nathan Chancellor <nathan@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Matthew Brost <matthew.brost@intel.com>,
Andrew Morton <akpm@linux-foundation.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: Fri, 24 Jul 2026 12:48:08 -0700 [thread overview]
Message-ID: <20260724194808.GA1461047@ax162> (raw)
In-Reply-To: <93289e91-ef9f-4786-bf49-e93d91afc1ad@sirena.org.uk>
On Fri, Jul 24, 2026 at 01:13:42AM +0100, Mark Brown wrote:
> On Thu, Jul 23, 2026 at 04:11:48PM -0700, Matthew Brost wrote:
> > On Thu, Jul 23, 2026 at 04:09:42PM -0700, Andrew Morton wrote:
>
> > > 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.
>
> So should I drop Nathan's fixup then?
As you may or may not have seen yet, the drm commit has been reverted in
the drm-misc-fixes branch, so my change should no longer apply.
--
Cheers,
Nathan
next prev parent reply other threads:[~2026-07-24 19:48 UTC|newest]
Thread overview: 8+ 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
2026-07-23 23:11 ` Matthew Brost
2026-07-24 0:13 ` Mark Brown
2026-07-24 19:48 ` Nathan Chancellor [this message]
2026-07-24 19:50 ` Matthew Brost
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=20260724194808.GA1461047@ax162 \
--to=nathan@kernel.org \
--cc=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=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