From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll•ch>,
Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Alex Deucher <alexdeucher@gmail•com>
Cc: "Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Brian Welty" <brian.welty@intel•com>,
"Christian König" <christian.koenig@amd•com>
Subject: linux-next: manual merge of the drm-misc tree with the amdgpu tree
Date: Mon, 28 Oct 2019 13:24:03 +1100 [thread overview]
Message-ID: <20191028132403.24736cbd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/ttm/ttm_bo_util.c
between commit:
6d9d5ba31dd1 ("drm/ttm: Refactor ttm_bo_pipeline_move")
from the amdgpu tree and commit:
ef38321897cf ("drm/ttm: use the parent resv for ghost objects v3")
from the drm-misc tree.
I fixed it up (the code changed by the latter was removed by the former)
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 --]
next reply other threads:[~2019-10-28 2:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 2:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-09 14:35 linux-next: manual merge of the drm-misc tree with the amdgpu tree Mark Brown
2026-03-09 14:37 ` Thomas Zimmermann
2020-11-03 3:21 Stephen Rothwell
2020-11-09 2:16 ` Stephen Rothwell
2020-10-28 1:06 Stephen Rothwell
2020-11-05 0:39 ` Stephen Rothwell
2020-08-26 0:18 Stephen Rothwell
2020-09-03 7:06 ` Stephen Rothwell
2019-08-07 3:09 Stephen Rothwell
2019-06-12 1:46 Stephen Rothwell
2019-06-17 3:25 ` Stephen Rothwell
2019-05-21 0:38 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=20191028132403.24736cbd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexdeucher@gmail$(echo .)com \
--cc=brian.welty@intel$(echo .)com \
--cc=christian.koenig@amd$(echo .)com \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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