linux-next: manual merge of the amdgpu tree with the drm-misc tree

[Mark Brown]

Hi all,

Today's linux-next merge of the amdgpu tree got a conflict in:

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h

between commit:

  32fbec62a3e9f ("drm/amdgpu: dm: Convert to atomic_create_state")

from the drm-misc tree and commit:

  b40f65c12577b ("drm/amd/display: Cover crtc destroy callback")

from the amdgpu tree (there are furher fixups later).

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/display/amdgpu_dm/amdgpu_dm_crtc.h
index ad516aeb9798e,91fdd262c2d2d..0000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h
@@@ -49,7 -49,8 +49,8 @@@ bool amdgpu_dm_crtc_helper_mode_fixup(s
  void amdgpu_dm_crtc_destroy_state(struct drm_crtc *crtc,
  				  struct drm_crtc_state *state);
  struct drm_crtc_state *amdgpu_dm_crtc_duplicate_state(struct drm_crtc *crtc);
 +struct drm_crtc_state *amdgpu_dm_crtc_create_state(struct drm_crtc *crtc);
+ void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc);
 -void amdgpu_dm_crtc_reset_state(struct drm_crtc *crtc);
  int amdgpu_dm_crtc_count_crtc_active_planes(struct drm_crtc_state *new_crtc_state);
  void amdgpu_dm_crtc_update_crtc_active_planes(struct drm_crtc *crtc,
  					      struct drm_crtc_state *new_crtc_state);

Attachment: signature.asc
Description: PGP signature