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
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
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
>
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
On Tue, Aug 4, 2020 at 9:19 AM Jason Gunthorpe <[email protected]> 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
>
On Tue, Aug 04, 2020 at 09:29:30AM +1000, Ben Skeggs wrote:
> On Tue, Aug 4, 2020 at 9:19 AM Jason Gunthorpe <[email protected]> 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
Hi all,
On Thu, 30 Jul 2020 19:21:10 +1000 Stephen Rothwell <[email protected]> wrote:
>
> 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.
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell