From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org>
Cc: Ben Skeggs <bskeggs@redhat.com>,
Ralph Campbell <rcampbell@nvidia.com>,
Jason Gunthorpe <jgg@mellanox.com>,
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, 6 Aug 2020 11:51:40 +1000 [thread overview]
Message-ID: <20200806115140.6aa46042@canb.auug.org.au> (raw)
In-Reply-To: <20200730192110.1466e63e@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 1082 bytes --]
Hi all,
On Thu, 30 Jul 2020 19:21:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-08-06 1:51 UTC|newest]
Thread overview: 10+ 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
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 [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-14 5:23 Stephen Rothwell
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=20200806115140.6aa46042@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rcampbell@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).