Re: linux-next: manual merge of the hmm tree with the drm tree

2020-08-05 Thread Stephen Rothwell
Hi all, On Thu, 30 Jul 2020 19:21:10 +1000 Stephen Rothwell 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") > >

Re: linux-next: manual merge of the hmm tree with the drm tree

2020-08-03 Thread Jason Gunthorpe
On Tue, Aug 04, 2020 at 09:29:30AM +1000, Ben Skeggs wrote: > On Tue, Aug 4, 2020 at 9:19 AM Jason Gunthorpe 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,

Re: linux-next: manual merge of the hmm tree with the drm tree

2020-08-03 Thread Ben Skeggs
On Tue, Aug 4, 2020 at 9:19 AM Jason Gunthorpe 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

Re: linux-next: manual merge of the hmm tree with the drm tree

2020-08-03 Thread Jason Gunthorpe
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: > > > > > >

Re: linux-next: manual merge of the hmm tree with the drm tree

2020-07-30 Thread Ralph Campbell
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-:

Re: linux-next: manual merge of the hmm tree with the drm tree

2020-07-30 Thread Jason Gunthorpe
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") >

linux-next: manual merge of the hmm tree with the drm tree

2020-07-30 Thread Stephen Rothwell
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