linux-next: manual merge of the random tree with the pm tree

[Stephen Rothwell]

Hi all,

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

  drivers/virt/vmgenid.c

between commit:

  00e8b52bf9f9 ("virt: vmgenid: drop owner assignment")

from the pm tree and commits:

  e07606713a90 ("virt: vmgenid: change implementation to use a platform driver")
  7b1bcd6b50a6 ("virt: vmgenid: add support for devicetree bindings")

from the random tree.

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

Attachment: pgpk7xITMJT6u.pgp
Description: OpenPGP digital signature