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 <alexander.deucher@amd•com>
Cc: "Christian König" <christian.koenig@amd•com>,
"Dave Airlie" <airlied@redhat•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Mihir Bhogilal Patel" <Mihir.Patel@amd•com>
Subject: Re: linux-next: manual merge of the drm-misc tree with the amdgpu tree
Date: Thu, 5 Nov 2020 11:39:05 +1100 [thread overview]
Message-ID: <20201105113905.55a7d59f@canb.auug.org.au> (raw)
In-Reply-To: <20201028120631.1a1e239c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1995 bytes --]
Hi all,
On Wed, 28 Oct 2020 12:06:31 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>
> between commit:
>
> ff72bc403170 ("drm/amdgpu: Add debugfs entry for printing VM info")
>
> from the amdgpu tree and commit:
>
> 4671078eb8e3 ("drm/amdgpu: switch over to the new pin interface")
>
> from the drm-misc tree.
>
> I fixed it up (I used the former version of this file and added the
> following patch) 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Wed, 28 Oct 2020 11:52:31 +1100
> Subject: [PATCH] merge fix up for "drm/amdgpu: Add debugfs entry for printing
> VM info"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index baca32263ec4..06dfe9b1c7e6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -1555,7 +1555,7 @@ u64 amdgpu_bo_print_info(int id, struct amdgpu_bo *bo, struct seq_file *m)
> seq_printf(m, "\t\t0x%08x: %12lld byte %s",
> id, size, placement);
>
> - pin_count = READ_ONCE(bo->pin_count);
> + pin_count = READ_ONCE(bo->tbo.pin_count);
> if (pin_count)
> seq_printf(m, " pin count %d", pin_count);
>
This fix up is now needed in the merge between the drm tree and the
amdgpu tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-11-05 0:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 1:06 linux-next: manual merge of the drm-misc tree with the amdgpu tree Stephen Rothwell
2020-11-05 0:39 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-09 14:35 Mark Brown
2026-03-09 14:37 ` Thomas Zimmermann
2020-11-03 3:21 Stephen Rothwell
2020-11-09 2:16 ` Stephen Rothwell
2020-08-26 0:18 Stephen Rothwell
2020-09-03 7:06 ` Stephen Rothwell
2019-10-28 2:24 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=20201105113905.55a7d59f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Mihir.Patel@amd$(echo .)com \
--cc=airlied@redhat$(echo .)com \
--cc=alexander.deucher@amd$(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