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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1331 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Rafael J. Wysocki]

Hi Stephen,

On Tuesday, March 5, 2024 1:26:41 AM CET Stephen Rothwell wrote:
> 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.

The conflict resolution looks good to me, thank you!

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

[Alex Elder]

On 3/4/24 6:26 PM, Stephen Rothwell wrote:
> 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.


Your fixup is correct.  It exactly matches the change in
c0ef3df8dbaef ("PM: runtime: Simplify pm_runtime_get_if_active()
usage"), which is in linux-next but not net-next.

Thank you!  And if you need it:

Reviewed-by: Alex Elder <elder@linaro.org>

					-Alex

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 823 bytes --]

Hi all,

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

  drivers/net/ethernet/mellanox/mlxsw/core_thermal.c

between commit:

  dbb0ea153401 ("thermal: Use thermal_zone_device_type() accessor")

from the pm tree and commit:

  5601ef91fba8 ("mlxsw: core_thermal: Use static trip points for transceiver modules")

from the net-next tree.

I fixed it up (the latter removed the code updated by the former) 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 744 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
fs/select.c between commit 9745cdb36da8 ("select: use freezable blocking
call") from the pm tree and commit 2d48d67fa8cd ("net: poll/select low
latency socket support") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/select.c
index 6b14dc7,79b876e..0000000
--- a/fs/select.c
+++ b/fs/select.c
@@@ -27,7 -27,7 +27,8 @@@
  #include <linux/rcupdate.h>
  #include <linux/hrtimer.h>
  #include <linux/sched/rt.h>
 +#include <linux/freezer.h>
+ #include <net/ll_poll.h>
  
  #include <asm/uaccess.h>
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]