On Wed, Apr 20, 2022 at 02:41:04PM +0000, Wang, Zhi A wrote: > On 4/20/22 12:13 PM, Jason Gunthorpe wrote: > > On Wed, Apr 20, 2022 at 08:04:31AM +0000, Wang, Zhi A wrote: > >> Hi folks: > >> > >> Here is the PR of gvt-next. > >> > >> Mostly it includes the patch bundle of GVT-g re-factor patches for adapting the GVT-g with the > >> new MDEV interfaces: > >> > >> - Separating the MMIO table from GVT-g. (Zhi) > >> - GVT-g re-factor. (Christoph) > >> - GVT-g mdev API cleanup. (Jason) > >> - GVT-g trace/makefile cleanup. (Jani) > >> > >> Thanks so much for making this happen. > >> > >> This PR has been tested as following and no problem shows up: > >> > >> $dim update-branches > >> $dim apply-pull drm-intel-next < this_email.eml > >> > >> The following changes since commit b39d2c6202426b560641e5800c5523851b5db586: > >> > >> drm/i915/fbc: Call intel_fbc_activate() directly from frontbuffer flush (2022-04-13 17:20:49 +0300) > > > > ?? > > > > Why did you rebase this again? It needs to be on a rc release tag as > > you had in your github, not whatever this is. > > > Hi Jason: > > Here is what I understand, the pull going to the drm-intel-next > needs to be based on drm-intel-next from the branch gvt-next. No, there cannot be two pulls, as I explained when using topic branches you must never rebase. > The pull going to the VFIO needs to be based on -rc, the > topic/for-christoph brnach. Yes, so what you need to do is: # Get a clean tree on drm-intel-next $ git worktree add /tmp/gvt-next Preparing worktree (new branch 'gvt-next') $ cd /tmp/gvt-next $ git reset --hard b39d2c6202426b560641e5800c5523851b5db586 # drm-intel-next commit you tested # Merge Christoph's topic: $ git fetch https://github.com/intel/gvt-linux.git topic/for-christoph $ git merge FETCH_HEAD Auto-merging drivers/gpu/drm/i915/Makefile Auto-merging drivers/gpu/drm/i915/gvt/handlers.c Auto-merging drivers/gpu/drm/i915/i915_driver.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Merge made by the 'ort' strategy. [.. Merge branch 'topic/for-christoph' of https://github.com/intel/gvt-linux into gvt-next # By Christoph Hellwig (27) and others # Via Zhi Wang * 'topic/for-christoph' of https://github.com/intel/gvt-linux: (37 commits) ] And then check it against what you prepared in this PR here: $ git diff HEAD 888471711a80b22c53547f3a625f20f487714f28 [empty] *do not rebase a topic branch* this is very important. Now - given that we can see there is no merge conflict you don't need to do anything! Just send topic/for-christoph, exactly as-it-is to drm-intel-next as a PR and that is all. > Sorry this is way too complicated to me. Let me prepare the new pull > as what you ask. Shall I send the exact same pull to i915 and VFIO ? Yes, exact same, this is important. You were very close before, the only issue was rebasing topic/for-christoph instead of merging. Jason
