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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1668 bytes --]

Hi all,

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

  include/drm/drm_kunit_helpers.h

between commit:

  13c1d5f3a7fa ("drm/tests: helpers: Create kunit helper to destroy a drm_display_mode")

from the drm-misc-fixes tree and commit:

  e4e3de631d14 ("drm/tests: helpers: Create new helper to enable output")

from the drm-misc 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/drm/drm_kunit_helpers.h
index 1c62d1d4458c,1cda7281f300..000000000000
--- a/include/drm/drm_kunit_helpers.h
+++ b/include/drm/drm_kunit_helpers.h
@@@ -118,9 -119,13 +119,16 @@@ drm_kunit_helper_create_crtc(struct kun
  			     const struct drm_crtc_funcs *funcs,
  			     const struct drm_crtc_helper_funcs *helper_funcs);
  
+ int drm_kunit_helper_enable_crtc_connector(struct kunit *test,
+ 					   struct drm_device *drm,
+ 					   struct drm_crtc *crtc,
+ 					   struct drm_connector *connector,
+ 					   const struct drm_display_mode *mode,
+ 					   struct drm_modeset_acquire_ctx *ctx);
+ 
 +int drm_kunit_add_mode_destroy_action(struct kunit *test,
 +				      struct drm_display_mode *mode);
 +
  struct drm_display_mode *
  drm_kunit_display_mode_from_cea_vic(struct kunit *test, struct drm_device *dev,
  				    u8 video_code);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]