linux-next: manual merge of the pm tree with the arm-soc tree

Stephen Rothwell
2017-04-21T00:54:07Z

Hi all,

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

include/dt-bindings/genpd/k2g.h

between commit:

7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains")

from the arm-soc tree and commit:

45da8edd1741 ("dt-bindings: Add TI SCI PM Domains")

from the pm tree.

I fixed it up (I just used the pm tree version) 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