From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kevin Wang <kevin1.wang@amd.com>, Evan Quan <evan.quan@amd.com>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree
Date: Mon, 28 Oct 2019 12:11:34 +1100 [thread overview]
Message-ID: <20191028121134.63b6c3c0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 829 bytes --]
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
between commit:
155f85c0d568 ("drm/amd/powerplay: remove duplicate macro smu_get_uclk_dpm_states in amdgpu_smu.h")
from Linus' tree and commit:
18c1d3cee4c5 ("drm/amd/powerplay: split out those internal used swSMU APIs V2")
from the amdgpu tree.
I fixed it up (I just used the amdgpu tree version) 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 1:11 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 1:11 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-11-05 22:48 linux-next: manual merge of the amdgpu tree with Linus' tree 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: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=20191028121134.63b6c3c0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alexdeucher@gmail.com \
--cc=evan.quan@amd.com \
--cc=kevin1.wang@amd.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: 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;
as well as URLs for NNTP newsgroup(s).