From: Mark Brown <broonie@kernel.org>
To: Alex Deucher <alexander.deucher@amd.com>,
Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
Rex Zhu <Rex.Zhu@amd.com>, Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the sound-asoc tree with the drm-misc tree
Date: Wed, 18 Oct 2017 10:57:33 +0100 [thread overview]
Message-ID: <20171018095733.2ffvg6ty6kn2lfdf@sirena.co.uk> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1672 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
drivers/gpu/drm/amd/include/amd_shared.h
between commit:
cfa289fd4986c ("drm/amdgpu: rename amdgpu_dpm_funcs to amd_pm_funcs")
from the drm-misc tree and commit:
1e4448648333a ("drm/amdgpu Moving amdgpu asic types to a separate file")
from the sound-asoc 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.
diff --cc drivers/gpu/drm/amd/include/amd_shared.h
index de6fc2731b98,3a49fbd8baf8..000000000000
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@@ -23,37 -23,10 +23,39 @@@
#ifndef __AMD_SHARED_H__
#define __AMD_SHARED_H__
- #define AMD_MAX_USEC_TIMEOUT 200000 /* 200 ms */
+ #include <drm/amd_asic_type.h>
+struct seq_file;
+
+/*
+ * Supported ASIC types
+ */
+enum amd_asic_type {
+ CHIP_TAHITI = 0,
+ CHIP_PITCAIRN,
+ CHIP_VERDE,
+ CHIP_OLAND,
+ CHIP_HAINAN,
+ CHIP_BONAIRE,
+ CHIP_KAVERI,
+ CHIP_KABINI,
+ CHIP_HAWAII,
+ CHIP_MULLINS,
+ CHIP_TOPAZ,
+ CHIP_TONGA,
+ CHIP_FIJI,
+ CHIP_CARRIZO,
+ CHIP_STONEY,
+ CHIP_POLARIS10,
+ CHIP_POLARIS11,
+ CHIP_POLARIS12,
+ CHIP_VEGA10,
+ CHIP_RAVEN,
+ CHIP_LAST,
+};
+
+ #define AMD_MAX_USEC_TIMEOUT 200000 /* 200 ms */
+
/*
* Chip flags
*/
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2017-10-18 9:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 9:57 Mark Brown [this message]
2017-10-18 10:08 ` linux-next: manual merge of the sound-asoc tree with the drm-misc tree Mark Brown
2017-10-18 14:33 ` Deucher, Alexander
2017-10-18 16:26 ` Mark Brown
2017-10-18 14:30 ` Deucher, Alexander
2017-10-18 14:52 ` Mark Brown
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=20171018095733.2ffvg6ty6kn2lfdf@sirena.co.uk \
--to=broonie@kernel.org \
--cc=Rex.Zhu@amd.com \
--cc=Vijendar.Mukunda@amd.com \
--cc=alexander.deucher@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lgirdwood@gmail.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