linux-next: manual merge of the phy-next tree with the drm-msm tree

linux-next: manual merge of the phy-next tree with the drm-msm tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/gpu/drm/msm/dp/dp_parser.h

between commit:

  50b1131e0674 ("drm/msm/dp: rewrite dss_module_power to use bulk clock functions")

from the drm-msm tree and commit:

  fa384dd8b9b8 ("drm/msm/dp: delete vdda regulator related functions from eDP/DP controller")

from the phy-next 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 drivers/gpu/drm/msm/dp/dp_parser.h
index 9abddc6d50c0,47430e3a97bf..000000000000
--- a/drivers/gpu/drm/msm/dp/dp_parser.h
+++ b/drivers/gpu/drm/msm/dp/dp_parser.h
@@@ -100,16 -99,6 +98,11 @@@ struct dp_reg_entry 
  	int disable_load;
  };
  
- struct dp_regulator_cfg {
- 	int num;
- 	struct dp_reg_entry regs[DP_DEV_REGULATOR_MAX];
- };
- 
 +struct dss_module_power {
 +	unsigned int num_clk;
 +	struct clk_bulk_data *clocks;
 +};
 +
  /**
   * struct dp_parser - DP parser's data exposed to clients
   *

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