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

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