On Tue, Jun 16, 2026 at 04:01:06PM +0200, Vlastimil Babka (SUSE) wrote: > On 6/16/26 15:14, Mark Brown wrote:
> > interacting with changes in the drm tree. I have applied the fixup > > below and can carry as needed. > Initially there was a conflict between drm and slab and your resolution > removed that line: > https://lore.kernel.org/all/[email protected]/ > I think nothing has changed except that the slab part was merged to mainline > since. Maybe that changed the ordering of the two trees and you had to redo > the conflict resolution? That'll be it, it didn't turn up as a conflict with the new ordering. I did scan through for a prior issue but nothing jumped out.
signature.asc
Description: PGP signature
