Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Danilo Krummrich" <dakr@kernel.org>
To: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Cc: "Matthew Brost" <matthew.brost@intel.com>,
	"Honglei Huang" <honghuan@amd.com>, <sima@ffwll.ch>,
	<rodrigo.vivi@intel.com>, <intel-xe@lists.freedesktop.org>,
	<aliceryhl@google.com>, <Alexander.Deucher@amd.com>,
	<Felix.Kuehling@amd.com>, <Christian.Koenig@amd.com>,
	<Ray.Huang@amd.com>, <Lingshan.Zhu@amd.com>,
	<Junhua.Shen@amd.com>, <Yiru.Ma@amd.com>,
	<amd-gfx@lists.freedesktop.org>,
	<dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH v10 0/5] drm/gpusvm: split MM and device state across gpusvm/range/pages
Date: Wed, 01 Jul 2026 18:26:04 +0200	[thread overview]
Message-ID: <DJNDIIFV82WU.21FKVRT80BJ73@kernel.org> (raw)
In-Reply-To: <6f612bb912271b0dabb86c10e4f81dfbd4c4d31c.camel@linux.intel.com>

On Wed Jul 1, 2026 at 5:56 PM CEST, Thomas Hellström wrote:
> Hi Danilo,
>
> On Tue, 2026-06-30 at 16:33 +0200, Danilo Krummrich wrote:
>> On Tue Jun 30, 2026 at 4:26 PM CEST, Matthew Brost wrote:
>> > If we merge the patches in drm-xe-next and pick them up via a
>> > rebase in the
>> > AMD trees, that works.
>> 
>> IIUC what your are proposing this will create duplicate commits,
>> which should be
>> avoided.
>> 
>> If the series is needed in multiple trees it is better to pick a
>> common base and
>> share via a tag that can be merged in all relevant trees.
>
> Our standard workflow if we need commits merged elsewhere in the DRM
> tree is to wait for it to appear in drm-next and then backmerge drm-
> next into our branch. It sounds like that's what Matthew is proposing
> here? And it wouldn't create duplicate commits?

Sure, that works. But "merge in tree A and pick up via rebase in tree B" would
create duplicate commits, which we should avoid.

  reply	other threads:[~2026-07-01 16:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-30 10:21 [PATCH v10 0/5] drm/gpusvm: split MM and device state across gpusvm/range/pages Honglei Huang
2026-06-30 10:21 ` [PATCH v10 1/5] drm/gpusvm: split MM state flags out of drm_gpusvm_pages_flags Honglei Huang
2026-06-30 10:21 ` [PATCH v10 2/5] drm/gpusvm: embed struct drm_device into drm_gpusvm_pages Honglei Huang
2026-06-30 10:21 ` [PATCH v10 3/5] drm/xe: have xe_svm_range embed one drm_gpusvm_pages Honglei Huang
2026-06-30 10:21 ` [PATCH v10 4/5] drm/gpusvm: move struct drm_gpusvm_pages out of struct drm_gpusvm_range Honglei Huang
2026-06-30 10:21 ` [PATCH v10 5/5] drm/gpusvm: let the drm_gpusvm core context purely MM level Honglei Huang
2026-06-30 12:01 ` ✓ CI.KUnit: success for drm/gpusvm: split MM and device state across gpusvm/range/pages (rev7) Patchwork
2026-06-30 12:56 ` ✓ Xe.CI.BAT: " Patchwork
2026-06-30 14:26 ` [PATCH v10 0/5] drm/gpusvm: split MM and device state across gpusvm/range/pages Matthew Brost
2026-06-30 14:33   ` Danilo Krummrich
2026-07-01 15:56     ` Thomas Hellström
2026-07-01 16:26       ` Danilo Krummrich [this message]
2026-07-01  3:34   ` Huang, Honglei
2026-07-01  3:16 ` ✓ Xe.CI.FULL: success for drm/gpusvm: split MM and device state across gpusvm/range/pages (rev7) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DJNDIIFV82WU.21FKVRT80BJ73@kernel.org \
    --to=dakr@kernel.org \
    --cc=Alexander.Deucher@amd.com \
    --cc=Christian.Koenig@amd.com \
    --cc=Felix.Kuehling@amd.com \
    --cc=Junhua.Shen@amd.com \
    --cc=Lingshan.Zhu@amd.com \
    --cc=Ray.Huang@amd.com \
    --cc=Yiru.Ma@amd.com \
    --cc=aliceryhl@google.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=honghuan@amd.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=matthew.brost@intel.com \
    --cc=rodrigo.vivi@intel.com \
    --cc=sima@ffwll.ch \
    --cc=thomas.hellstrom@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox