From: Stephen Rothwell <sfr@canb.auug.org.au> To: Jason Gunthorpe <jgg@mellanox.com>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Alex Deucher <alexander.deucher@amd.com> Subject: linux-next: manual merge of the hmm tree with the drm tree Date: Thu, 14 Nov 2019 16:23:06 +1100 [thread overview] Message-ID: <20191114162306.6d66211b@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 818 bytes --] Hi all, Today's linux-next merge of the hmm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c between commit: 4d8e54d2b9d3 ("drm/amdgpu/mn: fix documentation for amdgpu_mn_read_lock") from the drm tree and commit: a2849b5dcc9e ("drm/amdgpu: Use mmu_interval_insert instead of hmm_mirror") from the hmm tree. I fixed it up (the latter removed the code updated by the former, so I did that) 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. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Jason Gunthorpe <jgg@mellanox.com>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Cc: Alex Deucher <alexander.deucher@amd.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: linux-next: manual merge of the hmm tree with the drm tree Date: Thu, 14 Nov 2019 16:23:06 +1100 [thread overview] Message-ID: <20191114162306.6d66211b@canb.auug.org.au> (raw) Message-ID: <20191114052306.k4OrFwXu_WCZ45Qp7OOjjIzej9JlTDiHN-c1Vars5V4@z> (raw) [-- Attachment #1.1: Type: text/plain, Size: 818 bytes --] Hi all, Today's linux-next merge of the hmm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c between commit: 4d8e54d2b9d3 ("drm/amdgpu/mn: fix documentation for amdgpu_mn_read_lock") from the drm tree and commit: a2849b5dcc9e ("drm/amdgpu: Use mmu_interval_insert instead of hmm_mirror") from the hmm tree. I fixed it up (the latter removed the code updated by the former, so I did that) 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. -- Cheers, Stephen Rothwell [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2019-11-14 5:23 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-14 5:23 Stephen Rothwell [this message] 2019-11-14 5:23 ` linux-next: manual merge of the hmm tree with the drm tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2020-07-30 9:21 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 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=20191114162306.6d66211b@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=airlied@linux.ie \ --cc=alexander.deucher@amd.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=jgg@mellanox.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ /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: linkBe 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).