-----Original Message----- From: Mark Brown [mailto:broonie@kernel.org] Sent: Wednesday, October 18, 2017 5:58 AM To: Deucher, Alexander; Mukunda, Vijendar; Zhu, Rex; Daniel Vetter; Intel Graphics; DRI; Liam Girdwood Cc: Linux-Next Mailing List; Linux Kernel Mailing List Subject: linux-next: manual merge of the sound-asoc tree with the drm-misc tree
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")
The patch below effectively reverts 1e4448648333a. If you drop the patch below, you should be fine.
Alex
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