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
