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

[Stephen Rothwell]

Hi all,

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

  drivers/net/ipa/ipa_smp2p.c

between commit:

  c0ef3df8dbae ("PM: runtime: Simplify pm_runtime_get_if_active() usage")

from the pm tree and commit:

  5245f4fd28d1 ("net: ipa: don't save the platform device")

from the net-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/net/ipa/ipa_smp2p.c
index cbf3d4761ce3,aeccce9fab72..000000000000
--- a/drivers/net/ipa/ipa_smp2p.c
+++ b/drivers/net/ipa/ipa_smp2p.c
@@@ -91,8 -90,7 +90,7 @@@ static void ipa_smp2p_notify(struct ipa
  	if (smp2p->notified)
  		return;
  
- 	dev = &smp2p->ipa->pdev->dev;
- 	smp2p->power_on = pm_runtime_get_if_active(dev) > 0;
 -	smp2p->power_on = pm_runtime_get_if_active(smp2p->ipa->dev, true) > 0;
++	smp2p->power_on = pm_runtime_get_if_active(smp2p->ipa->dev) > 0;
  
  	/* Signal whether the IPA power is enabled */
  	mask = BIT(smp2p->enabled_bit);

Attachment: pgp8_djz_PsXZ.pgp
Description: OpenPGP digital signature