From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Deucher <alexdeucher@gmail•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>,
"Christian König" <ckoenig.leichtzumerken@gmail•com>
Subject: linux-next: manual merge of the amdgpu tree with the drm tree
Date: Mon, 24 Feb 2020 10:38:12 +1100 [thread overview]
Message-ID: <20200224103812.017657a3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
Hi all,
Today's linux-next merge of the amdgpu tree got conflicts in:
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
between commit:
5e791166d377 ("drm/ttm: nuke invalidate_caches callback")
from the drm tree and commit:
58e6933fa53e ("drm/amdgpu/ttm: move debugfs init into core amdgpu debugfs")
from the amdgpu tree.
I fixed it up (see below) 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
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 3ab46d4647e4,660867cf2597..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -66,9 -68,11 +68,6 @@@ static int amdgpu_map_buffer(struct ttm
struct amdgpu_ring *ring,
uint64_t *addr);
- static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev);
- static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev);
-static int amdgpu_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)
-{
- return 0;
-}
--
/**
* amdgpu_init_mem_type - Initialize a memory manager for a specific type of
* memory request.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-02-23 23:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-23 23:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-02-28 0:21 linux-next: manual merge of the amdgpu tree with the drm tree Stephen Rothwell
2020-04-23 2:13 Stephen Rothwell
2020-11-16 2:03 Stephen Rothwell
2020-11-17 0:31 Stephen Rothwell
2021-10-28 3:06 Stephen Rothwell
2021-10-28 3:22 ` Alex Deucher
2022-04-29 1:03 Stephen Rothwell
2022-10-27 23:57 Stephen Rothwell
2022-11-22 1:28 Stephen Rothwell
2023-07-26 1:10 Stephen Rothwell
2024-11-05 1:28 Stephen Rothwell
2025-02-20 1:28 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=20200224103812.017657a3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=alexdeucher@gmail$(echo .)com \
--cc=ckoenig.leichtzumerken@gmail$(echo .)com \
--cc=dri-devel@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