Re: [PATCH v7 7/8] vfio: Permit VFIO to work with pinned importers

[Christian König]

On 2/4/26 17:56, Alex Williamson wrote:
...
>>
>> This chunk here doesn't want to apply to drm-misc-next, my educated
>> guess is that the patch adding those lines is missing in that tree.
>>
>> How should we handle that? Patches 1-3 have already been pushed to
>> drm-misc-next and I would rather like to push patches 4-6 through
>> that branch as well.
>>
>> I can request a backmerge from the drm-misc-next maintainers, but
>> then we clearly don't get that upstream this week.
> 
> Hmm, drm-next already has a backmerge up to v6.19-rc7, the patch here is
> based on a commit merged in rc8.  The tag for that change was based on
> rc6.  It can be found here:
> 
> https://github.com/awilliam/linux-vfio.git tags/vfio-v6.19-rc8
> 
> As the same tag Linus merged in:
> 
> 1f97d9dcf536 ("Merge tag 'vfio-v6.19-rc8' of https://github.com/awilliam/linux-vfio";)
> 
> drm-misc-next only seems to be based on v6.19-rc1 though, so I don't
> know that any of that helps.  Thanks,

Thanks Alex, that was indeed helpful.

Simona, Jani and Lucas can we do a backmerge of 6.19-rc8 into drm-misc-next or does that completely breaks the flow?

If it's not possible immediately then I will do the merge next week or so when the final 6.19 is out and everything merged back into the drm-misc trees.

Leon the flow of patches through the DRM subsystem is documented here: https://drm.pages.freedesktop.org/maintainer-tools/repositories/drm-misc.html#merge-timeline

Thanks,
Christian.

> 
> Alex