Received-SPF: pass (google.com: domain of linux-kernel+bounces-91451-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Tue, 5 Mar 2024 11:26:41 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,
 Paolo Abeni <pabeni@redhat.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Networking <netdev@vger.kernel.org>, Alex Elder <elder@linaro.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, "Rafael J. Wysocki"
 <rafael.j.wysocki@intel.com>, Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: linux-next: manual merge of the net-next tree with the pm tree
Message-ID: <20240305112641.6248c6fd@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/PtrpKQJkd6+R8z.2d0yv6Mo";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/PtrpKQJkd6+R8z.2d0yv6Mo
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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;
 =20
- 	dev =3D &smp2p->ipa->pdev->dev;
- 	smp2p->power_on =3D pm_runtime_get_if_active(dev) > 0;
 -	smp2p->power_on =3D pm_runtime_get_if_active(smp2p->ipa->dev, true) > 0;
++	smp2p->power_on =3D pm_runtime_get_if_active(smp2p->ipa->dev) > 0;
 =20
  	/* Signal whether the IPA power is enabled */
  	mask =3D BIT(smp2p->enabled_bit);

--Sig_/PtrpKQJkd6+R8z.2d0yv6Mo
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXmZsEACgkQAVBC80lX
0GwcJAf+MoMxPVMBLY5erdgoXg5CFIShShkpA/chIJDy+ImTgnd+nOBIUQjP9EdW
jJNjU1Xq6cZDeJ2I8k3O0haW041BgGVQkvcstwmYxt5/YwNuo7KvZdCzioWpgTRz
qv825HrFgYJQANqcTKdQvAhz7A943WjWjU2ByorbGFKyhyBASLZRCT1swQriDMzq
8dND96qPyqXdwImNgQSPN/eFJqHDl5ljfwKYgd6xBQOhAx+o2BP74XrHKjNPVXI8
CdNT/ePNfmh6VNmiTcaoCYBdYcSQsbhztrbEiXokIC6d+HXsYbfB60ipcfF1PIDD
YQQz40PTkEc/zz17cA0CgTPrnmUbjg==
=9lTA
-----END PGP SIGNATURE-----

--Sig_/PtrpKQJkd6+R8z.2d0yv6Mo--