On 4/20/22 7:08 AM, Christoph Hellwig wrote: > On Thu, Apr 14, 2022 at 11:38:59AM -0300, Jason Gunthorpe wrote: >> pull requests can flow through more than one tree concurrently. The >> purpose of the topic branch is to allow all the commits to be in all >> the trees they need to be in at once. >> >> So you should send this branch as a PR to the next logical upstream >> tree gvt patches normally go through, in the usual way that you send >> PRs. Especially in this case where there is a small merge conflict >> internal to DRM to resolve. I'm assuming this is the drm-intel-next >> tree? >> >> Once DRM is internally happy then VFIO can merge it as well. You can >> view VFIO as the secondary path to Linus, DRM as primary. Alex will >> mention in his pull request that VFIO has a 'shared branch with DRM >> for gvt'. > > Where do we stand here? The (somewhat misnamed) topic/for-christoph > branch looks fine to me now except for the mіssing "static inline" on > the intel_gvt_iterate_mmio_table stub. > > When can we expect it in the i915 tree and linux-next? > Qur QA finished the test yesterday and I just made a tag. The pull request is going to be sent today. Yes, I will fix that. Thanks, Zhi.
