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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200803231923.GR19097@mellanox.com>
Date:   Mon, 3 Aug 2020 20:19:23 -0300
From:   Jason Gunthorpe <jgg@...lanox.com>
To:     Ralph Campbell <rcampbell@...dia.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Ben Skeggs <bskeggs@...hat.com>,
        Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the hmm tree with the drm tree

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