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

[Stephen Rothwell]

Hi all,

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

  include/drm/drm_dp_mst_helper.h

between commit:

  14692a3637d4 ("drm/dp_mst: Add probe_lock")

from the Linus' tree and commit:

  f79489074c59 ("drm/dp_mst: Clear all payload id tables downstream when initializing")

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_dp_mst_helper.h
index d5fc90b30487,a448d701dc7e..000000000000
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@@ -565,18 -495,18 +566,25 @@@ struct drm_dp_mst_topology_mgr 
  	 */
  	struct mutex lock;
  
 +	/**
 +	 * @probe_lock: Prevents @work and @up_req_work, the only writers of
 +	 * &drm_dp_mst_port.mstb and &drm_dp_mst_branch.ports, from racing
 +	 * while they update the topology.
 +	 */
 +	struct mutex probe_lock;
 +
  	/**
- 	 * @mst_state: If this manager is enabled for an MST capable port. False
- 	 * if no MST sink/branch devices is connected.
+ 	 * @mst_state: If this manager is enabled for an MST capable port.
+ 	 * False if no MST sink/branch devices is connected.
  	 */
- 	bool mst_state;
+ 	bool mst_state : 1;
+ 
+ 	/**
+ 	 * @payload_id_table_cleared: Whether or not we've cleared the payload
+ 	 * ID table for @mst_primary. Protected by @lock.
+ 	 */
+ 	bool payload_id_table_cleared : 1;
+ 
  	/**
  	 * @mst_primary: Pointer to the primary/first branch device.
  	 */

Attachment: pgpeE64iPrBJ3.pgp
Description: OpenPGP digital signature