From: Ralph Campbell <rcampbell@nvidia•com>
To: Jason Gunthorpe <jgg@mellanox•com>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Ben Skeggs <bskeggs@redhat•com>
Cc: Dave Airlie <airlied@linux•ie>,
DRI <dri-devel@lists•freedesktop.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the hmm tree with the drm tree
Date: Thu, 30 Jul 2020 10:31:45 -0700 [thread overview]
Message-ID: <cf7af4c9-592a-2143-831a-cb0f44bc768e@nvidia.com> (raw)
In-Reply-To: <20200730120303.GQ19097@mellanox.com>
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
>
next prev parent reply other threads:[~2020-07-30 17:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2020-08-03 23:19 ` Jason Gunthorpe
2020-08-03 23:29 ` Ben Skeggs
2020-08-03 23:34 ` Jason Gunthorpe
2020-08-06 1:51 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-11-14 5:23 Stephen Rothwell
2019-11-05 8:00 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cf7af4c9-592a-2143-831a-cb0f44bc768e@nvidia.com \
--to=rcampbell@nvidia$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=bskeggs@redhat$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=jgg@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox