Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the hmm tree with the drm tree
@ 2020-07-30  9:21 Stephen Rothwell
  2020-07-30 12:03 ` Jason Gunthorpe
  0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2020-07-30  9:21 UTC (permalink / raw)
  To: Jason Gunthorpe, Dave Airlie, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Ralph Campbell, Ben Skeggs


[-- Attachment #1: Type: text/plain, Size: 885 bytes --]

Hi all,

Today's linux-next merge of the hmm tree got a conflict in:

  drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c

between commit:

  7763d24f3ba0 ("drm/nouveau/vmm/gp100-: fix mapping 2MB sysmem pages")

from the drm tree and commits:

  4725c6b82a48 ("nouveau: fix mapping 2MB sysmem pages")
  1a77decd0cae ("nouveau: fix storing invalid ptes")

from the hmm tree.

7763d24f3ba0 and 4725c6b82a48 are exactly the same patch.

I fixed it up (I just used the latter version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the hmm tree with the drm tree
  2020-07-30  9:21 linux-next: manual merge of the hmm tree with the drm tree Stephen Rothwell
@ 2020-07-30 12:03 ` Jason Gunthorpe
  2020-07-30 17:31   ` Ralph Campbell
  0 siblings, 1 reply; 8+ messages in thread
From: Jason Gunthorpe @ 2020-07-30 12:03 UTC (permalink / raw)
  To: Stephen Rothwell, Ben Skeggs
  Cc: Dave Airlie, DRI, Linux Next Mailing List,
	Linux Kernel Mailing List, Ralph Campbell

On Thu, Jul 30, 2020 at 07:21:10PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the hmm tree got a conflict in:
> 
>   drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c
> 
> between commit:
> 
>   7763d24f3ba0 ("drm/nouveau/vmm/gp100-: fix mapping 2MB sysmem pages")
> 
> from the drm tree and commits:
> 
>   4725c6b82a48 ("nouveau: fix mapping 2MB sysmem pages")
>   1a77decd0cae ("nouveau: fix storing invalid ptes")
> 
> from the hmm tree.
> 
> 7763d24f3ba0 and 4725c6b82a48 are exactly the same patch.

Oh? Ralph? What happened here?

Ben can you drop 7763d24f3ba0 ?

Jason

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the hmm tree with the drm tree
  2020-07-30 12:03 ` Jason Gunthorpe
@ 2020-07-30 17:31   ` Ralph Campbell
  2020-08-03 23:19     ` Jason Gunthorpe
  0 siblings, 1 reply; 8+ messages in thread
From: Ralph Campbell @ 2020-07-30 17:31 UTC (permalink / raw)
  To: Jason Gunthorpe, Stephen Rothwell, Ben Skeggs
  Cc: Dave Airlie, DRI, Linux Next Mailing List, Linux Kernel Mailing List


On 7/30/20 5:03 AM, Jason Gunthorpe wrote:
> On Thu, Jul 30, 2020 at 07:21:10PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the hmm tree got a conflict in:
>>
>>    drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c
>>
>> between commit:
>>
>>    7763d24f3ba0 ("drm/nouveau/vmm/gp100-: fix mapping 2MB sysmem pages")
>>
>> from the drm tree and commits:
>>
>>    4725c6b82a48 ("nouveau: fix mapping 2MB sysmem pages")
>>    1a77decd0cae ("nouveau: fix storing invalid ptes")
>>
>> from the hmm tree.
>>
>> 7763d24f3ba0 and 4725c6b82a48 are exactly the same patch.
> 
> Oh? Ralph? What happened here?

Ben did email me saying he was planning to take this patch into
his nouveau tree and I did reply to him saying you had also taken it
into your tree and that I had more nouveau/SVM patches for you on the way.
So, I'm not sure what happened.

> Ben can you drop 7763d24f3ba0 ?
> 
> Jason
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the hmm tree with the drm tree
  2020-07-30 17:31   ` Ralph Campbell
@ 2020-08-03 23:19     ` Jason Gunthorpe
  2020-08-03 23:29       ` Ben Skeggs
  0 siblings, 1 reply; 8+ messages in thread
From: Jason Gunthorpe @ 2020-08-03 23:19 UTC (permalink / raw)
  To: Ralph Campbell
  Cc: Stephen Rothwell, Ben Skeggs, Dave Airlie, DRI,
	Linux Next Mailing List, Linux Kernel Mailing List

On Thu, Jul 30, 2020 at 10:31:45AM -0700, Ralph Campbell wrote:
> 
> On 7/30/20 5:03 AM, Jason Gunthorpe wrote:
> > On Thu, Jul 30, 2020 at 07:21:10PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Today's linux-next merge of the hmm tree got a conflict in:
> > > 
> > >    drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c
> > > 
> > > between commit:
> > > 
> > >    7763d24f3ba0 ("drm/nouveau/vmm/gp100-: fix mapping 2MB sysmem pages")
> > > 
> > > from the drm tree and commits:
> > > 
> > >    4725c6b82a48 ("nouveau: fix mapping 2MB sysmem pages")
> > >    1a77decd0cae ("nouveau: fix storing invalid ptes")
> > > 
> > > from the hmm tree.
> > > 
> > > 7763d24f3ba0 and 4725c6b82a48 are exactly the same patch.
> > 
> > Oh? Ralph? What happened here?
> 
> Ben did email me saying he was planning to take this patch into
> his nouveau tree and I did reply to him saying you had also taken it
> into your tree and that I had more nouveau/SVM patches for you on the way.
> So, I'm not sure what happened.

Well no answer from Ben and it looks like it is in the main DRM tree,
so I will drop the 4725c6b82a48 patch from hmm.

Jason

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the hmm tree with the drm tree
  2020-08-03 23:19     ` Jason Gunthorpe
@ 2020-08-03 23:29       ` Ben Skeggs
  2020-08-03 23:34         ` Jason Gunthorpe
  0 siblings, 1 reply; 8+ messages in thread
From: Ben Skeggs @ 2020-08-03 23:29 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Ralph Campbell, Stephen Rothwell, Dave Airlie, DRI,
	Linux Next Mailing List, Linux Kernel Mailing List

On Tue, Aug 4, 2020 at 9:19 AM Jason Gunthorpe <jgg@mellanox.com> wrote:
>
> On Thu, Jul 30, 2020 at 10:31:45AM -0700, Ralph Campbell wrote:
> >
> > On 7/30/20 5:03 AM, Jason Gunthorpe wrote:
> > > On Thu, Jul 30, 2020 at 07:21:10PM +1000, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of the hmm tree got a conflict in:
> > > >
> > > >    drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c
> > > >
> > > > between commit:
> > > >
> > > >    7763d24f3ba0 ("drm/nouveau/vmm/gp100-: fix mapping 2MB sysmem pages")
> > > >
> > > > from the drm tree and commits:
> > > >
> > > >    4725c6b82a48 ("nouveau: fix mapping 2MB sysmem pages")
> > > >    1a77decd0cae ("nouveau: fix storing invalid ptes")
> > > >
> > > > from the hmm tree.
> > > >
> > > > 7763d24f3ba0 and 4725c6b82a48 are exactly the same patch.
> > >
> > > Oh? Ralph? What happened here?
> >
> > Ben did email me saying he was planning to take this patch into
> > his nouveau tree and I did reply to him saying you had also taken it
> > into your tree and that I had more nouveau/SVM patches for you on the way.
> > So, I'm not sure what happened.
>
> Well no answer from Ben and it looks like it is in the main DRM tree,
> so I will drop the 4725c6b82a48 patch from hmm.
My apologies, both for this slipping past me, and for the trouble.  I
did mean to drop that patch from my tree before sending it on to Dave.

Ben.

>
> Jason
>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the hmm tree with the drm tree
  2020-08-03 23:29       ` Ben Skeggs
@ 2020-08-03 23:34         ` Jason Gunthorpe
  0 siblings, 0 replies; 8+ messages in thread
From: Jason Gunthorpe @ 2020-08-03 23:34 UTC (permalink / raw)
  To: Ben Skeggs
  Cc: Ralph Campbell, Stephen Rothwell, Dave Airlie, DRI,
	Linux Next Mailing List, Linux Kernel Mailing List

On Tue, Aug 04, 2020 at 09:29:30AM +1000, Ben Skeggs wrote:
> On Tue, Aug 4, 2020 at 9:19 AM Jason Gunthorpe <jgg@mellanox.com> wrote:
> >
> > On Thu, Jul 30, 2020 at 10:31:45AM -0700, Ralph Campbell wrote:
> > >
> > > On 7/30/20 5:03 AM, Jason Gunthorpe wrote:
> > > > On Thu, Jul 30, 2020 at 07:21:10PM +1000, Stephen Rothwell wrote:
> > > > > Hi all,
> > > > >
> > > > > Today's linux-next merge of the hmm tree got a conflict in:
> > > > >
> > > > >    drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c
> > > > >
> > > > > between commit:
> > > > >
> > > > >    7763d24f3ba0 ("drm/nouveau/vmm/gp100-: fix mapping 2MB sysmem pages")
> > > > >
> > > > > from the drm tree and commits:
> > > > >
> > > > >    4725c6b82a48 ("nouveau: fix mapping 2MB sysmem pages")
> > > > >    1a77decd0cae ("nouveau: fix storing invalid ptes")
> > > > >
> > > > > from the hmm tree.
> > > > >
> > > > > 7763d24f3ba0 and 4725c6b82a48 are exactly the same patch.
> > > >
> > > > Oh? Ralph? What happened here?
> > >
> > > Ben did email me saying he was planning to take this patch into
> > > his nouveau tree and I did reply to him saying you had also taken it
> > > into your tree and that I had more nouveau/SVM patches for you on the way.
> > > So, I'm not sure what happened.
> >
> > Well no answer from Ben and it looks like it is in the main DRM tree,
> > so I will drop the 4725c6b82a48 patch from hmm.
> My apologies, both for this slipping past me, and for the trouble.  I
> did mean to drop that patch from my tree before sending it on to Dave.

No worries, it looks like I can't drop it anyhow as the later
1a77decd0cae really does thoroughly depend on it. :(

Thanks!
Jason

^ permalink raw reply	[flat|nested] 8+ messages in thread

* linux-next: manual merge of the hmm tree with the drm tree
@ 2019-11-14  5:23 Stephen Rothwell
  0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2019-11-14  5:23 UTC (permalink / raw)
  To: Jason Gunthorpe, Dave Airlie, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Alex Deucher


[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

Hi all,

Today's linux-next merge of the hmm tree got a conflict in:

  drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c

between commit:

  4d8e54d2b9d3 ("drm/amdgpu/mn: fix documentation for amdgpu_mn_read_lock")

from the drm tree and commit:

  a2849b5dcc9e ("drm/amdgpu: Use mmu_interval_insert instead of hmm_mirror")

from the hmm tree.

I fixed it up (the latter removed the code updated by the former, so I
did that) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* linux-next: manual merge of the hmm tree with the drm tree
@ 2019-11-05  8:00 Stephen Rothwell
  0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2019-11-05  8:00 UTC (permalink / raw)
  To: Jason Gunthorpe, Dave Airlie, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Alex Deucher


[-- Attachment #1: Type: text/plain, Size: 782 bytes --]

Hi all,

Today's linux-next merge of the hmm tree got a conflict in:

  drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c

between commit:

  4d8e54d2b9d3 ("drm/amdgpu/mn: fix documentation for amdgpu_mn_read_lock")

from the drm tree and commit:

  cb0d3d608a1a ("drm/amdgpu: Use mmu_range_insert instead of hmm_mirror")

from the hmm tree.

I fixed it up (I just used the latter version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, back to index

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-30  9:21 linux-next: manual merge of the hmm tree with the drm tree Stephen Rothwell
2020-07-30 12:03 ` Jason Gunthorpe
2020-07-30 17:31   ` Ralph Campbell
2020-08-03 23:19     ` Jason Gunthorpe
2020-08-03 23:29       ` Ben Skeggs
2020-08-03 23:34         ` Jason Gunthorpe
  -- strict thread matches above, loose matches on Subject: below --
2019-11-14  5:23 Stephen Rothwell
2019-11-05  8:00 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git