From: Thierry Reding <thierry.reding@kernel.org>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>
Cc: Mario Limonciello (AMD) <superm1@kernel.org>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree
Date: Wed, 06 May 2026 11:54:06 +0200 [thread overview]
Message-ID: <0525d1f1c670a3e47293f8e6fa64905c@kernel.org> (raw)
Hi all,
Today's linux-next merge of the amdgpu tree got conflicts in:
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
between commits:
87612bab9656 ("amdkfd: Only ignore -ENOENT for KFD init failuires")
from Linus' tree and commit:
0d831487b5be ("drm/amdgpu: nuke amdgpu_userq_fence_slab v2")
from the amdgpu tree.
I fixed it up by using the version from the amdgpu tree, which already
contains a version of the commit from Linus' tree. 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.
next reply other threads:[~2026-05-06 9:54 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-06 9:54 Thierry Reding [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-09 0:54 linux-next: manual merge of the amdgpu tree with Linus' tree Stephen Rothwell
2023-11-05 22:48 Stephen Rothwell
2023-11-06 23:49 ` Stephen Rothwell
2023-07-24 1:14 Stephen Rothwell
2023-05-12 0:38 Stephen Rothwell
2022-07-19 2:00 Stephen Rothwell
2022-01-26 23:32 Stephen Rothwell
2022-01-26 23:29 Stephen Rothwell
2022-01-11 23:09 Stephen Rothwell
2021-09-02 1:22 Stephen Rothwell
2021-09-10 1:16 ` Stephen Rothwell
2021-08-02 15:10 Mark Brown
2021-08-02 15:48 ` Mark Brown
2021-07-06 0:52 Stephen Rothwell
2021-01-15 0:53 Stephen Rothwell
2021-01-08 1:04 Stephen Rothwell
2020-11-03 3:10 Stephen Rothwell
2020-10-27 0:48 Stephen Rothwell
2020-10-16 1:48 Stephen Rothwell
2020-08-25 1:35 Stephen Rothwell
2020-07-22 4:34 Stephen Rothwell
2020-07-23 8:01 ` Daniel Vetter
2020-07-23 13:34 ` Alex Deucher
2019-12-12 0:03 Stephen Rothwell
2019-12-12 0:11 ` Stephen Rothwell
2019-12-12 0:16 ` Timothy Pearson
2019-12-11 23:37 Stephen Rothwell
2019-12-12 0:10 ` Stephen Rothwell
2019-10-28 1:11 Stephen Rothwell
2019-10-28 1:03 Stephen Rothwell
2019-10-28 0:57 Stephen Rothwell
2019-10-28 1:13 ` Masahiro Yamada
2019-10-03 0:19 Stephen Rothwell
2019-06-17 3:12 Stephen Rothwell
2019-03-18 23:55 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=0525d1f1c670a3e47293f8e6fa64905c@kernel.org \
--to=thierry.reding@kernel.org \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.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