linux-next: manual merge of the qcom tree with the origin tree

Hi all,

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

  drivers/clk/qcom/tcsrcc-glymur.c

between commit:

  995832b2cebe6 ("Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (c files)")

from the origin tree and commit:

  0753091abc4b4 ("clk: qcom: tcsrcc-glymur: Add regulator supplies and migrate to clk_ref helper")

from the qcom 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/clk/qcom/tcsrcc-glymur.c
index b44fccb795c6b,3388c1c3a2aaa..0000000000000
--- a/drivers/clk/qcom/tcsrcc-glymur.c
+++ b/drivers/clk/qcom/tcsrcc-glymur.c
@@@ -4,7 -4,10 +4,9 @@@
   */
  
  #include <linux/clk-provider.h>
+ #include <linux/clk/qcom.h>
 -#include <linux/mod_devicetable.h>
  #include <linux/module.h>
+ #include <linux/of.h>
  #include <linux/platform_device.h>
  #include <linux/regmap.h>

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpnV0QACgkQJNaLcl1U
h9DOLgf+JbJP5J49QC5l9WUYnpvEbtkT0KvDDgQudiJqjEpuAAaVS4th3XtL+FIg
pHocJnoPCOhVMx+t+SpH1WUVJ9EZoXdoxPg73ihscA2azzE6iPCug4Fd1hCoF9AP
aHC4yNg/RSriG6H7fFc7tBM7HowosgmaaQLTmiK8B00Cw7jdvbgvUCJ0k691IsjR
8qtv2VHpgylqb1N4EPeLzUROLycx+/nUXdozxgzdOwk93OaaEgiTTyCXtt3scflv
f6cGfAS5h6MFVK4juGGx9xWRxscQxvQGQri/W65ZBjy+Wwb0IX1Pfs3xZReWUy8y
aYYArC8lum2t0bafqDRnKuIuBv5GPQ==
=Ivqz
-----END PGP SIGNATURE-----