* linux-next: manual merge of the net-next tree with the pm tree
@ 2024-08-22 1:04 Stephen Rothwell
2024-08-22 8:17 ` Ido Schimmel
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2024-08-22 1:04 UTC (permalink / raw)
To: David Miller, Jakub Kicinski, Paolo Abeni, Networking,
Rafael J. Wysocki
Cc: Ido Schimmel, Linux Kernel Mailing List, Linux Next Mailing List,
Petr Machata, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 1908 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:
019c393b17cb ("mlxsw: core_thermal: Use the .should_bind() thermal zone callback")
from the pm tree and commit:
fb76ea1d4b12 ("mlxsw: core_thermal: Make mlxsw_thermal_module_{init, fini} symmetric")
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/ethernet/mellanox/mlxsw/core_thermal.c
index 0c50a0cc316d,303d2ce4dc1e..000000000000
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@@ -389,12 -450,8 +388,9 @@@ mlxsw_thermal_module_init(struct mlxsw_
struct mlxsw_thermal_area *area, u8 module)
{
struct mlxsw_thermal_module *module_tz;
+ int i;
module_tz = &area->tz_module_arr[module];
- /* Skip if parent is already set (case of port split). */
- if (module_tz->parent)
- return;
module_tz->module = module;
module_tz->slot_index = area->slot_index;
module_tz->parent = thermal;
@@@ -404,8 -461,8 +400,10 @@@
sizeof(thermal->trips));
memcpy(module_tz->cooling_states, default_cooling_states,
sizeof(thermal->cooling_states));
+ for (i = 0; i < MLXSW_THERMAL_NUM_TRIPS; i++)
+ module_tz->trips[i].priv = &module_tz->cooling_states[i];
+
+ return mlxsw_thermal_module_tz_init(module_tz);
}
static void mlxsw_thermal_module_fini(struct mlxsw_thermal_module *module_tz)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the net-next tree with the pm tree
2024-08-22 1:04 linux-next: manual merge of the net-next tree with the pm tree Stephen Rothwell
@ 2024-08-22 8:17 ` Ido Schimmel
0 siblings, 0 replies; 7+ messages in thread
From: Ido Schimmel @ 2024-08-22 8:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Jakub Kicinski, Paolo Abeni, Networking,
Rafael J. Wysocki, Linux Kernel Mailing List,
Linux Next Mailing List, Petr Machata, Rafael J. Wysocki
On Thu, Aug 22, 2024 at 11:04:30AM +1000, Stephen Rothwell wrote:
> 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:
>
> 019c393b17cb ("mlxsw: core_thermal: Use the .should_bind() thermal zone callback")
>
> from the pm tree and commit:
>
> fb76ea1d4b12 ("mlxsw: core_thermal: Make mlxsw_thermal_module_{init, fini} symmetric")
>
> 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.
Thanks Stephen. Looks correct to me and also fits the one posted by
Rafael:
https://lore.kernel.org/netdev/CAJZ5v0hX+HyNB5Xqwr6Q44rgAThNLqp5PUQXN-uTC+cDqdjpqA@mail.gmail.com/
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> index 0c50a0cc316d,303d2ce4dc1e..000000000000
> --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> @@@ -389,12 -450,8 +388,9 @@@ mlxsw_thermal_module_init(struct mlxsw_
> struct mlxsw_thermal_area *area, u8 module)
> {
> struct mlxsw_thermal_module *module_tz;
> + int i;
>
> module_tz = &area->tz_module_arr[module];
> - /* Skip if parent is already set (case of port split). */
> - if (module_tz->parent)
> - return;
> module_tz->module = module;
> module_tz->slot_index = area->slot_index;
> module_tz->parent = thermal;
> @@@ -404,8 -461,8 +400,10 @@@
> sizeof(thermal->trips));
> memcpy(module_tz->cooling_states, default_cooling_states,
> sizeof(thermal->cooling_states));
> + for (i = 0; i < MLXSW_THERMAL_NUM_TRIPS; i++)
> + module_tz->trips[i].priv = &module_tz->cooling_states[i];
> +
> + return mlxsw_thermal_module_tz_init(module_tz);
> }
>
> static void mlxsw_thermal_module_fini(struct mlxsw_thermal_module *module_tz)
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the net-next tree with the pm tree
@ 2024-03-05 0:26 Stephen Rothwell
2024-03-05 10:52 ` Rafael J. Wysocki
2024-03-05 13:23 ` Alex Elder
0 siblings, 2 replies; 7+ messages in thread
From: Stephen Rothwell @ 2024-03-05 0:26 UTC (permalink / raw)
To: David Miller, Jakub Kicinski, Paolo Abeni, Rafael J. Wysocki
Cc: Networking, Alex Elder, Linux Kernel Mailing List,
Linux Next Mailing List, Rafael J. Wysocki, Sakari Ailus
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the net-next tree with the pm tree
2024-03-05 0:26 Stephen Rothwell
@ 2024-03-05 10:52 ` Rafael J. Wysocki
2024-03-05 13:23 ` Alex Elder
1 sibling, 0 replies; 7+ messages in thread
From: Rafael J. Wysocki @ 2024-03-05 10:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Jakub Kicinski, Paolo Abeni, Networking, Alex Elder,
Linux Kernel Mailing List, Linux Next Mailing List,
Rafael J. Wysocki, Sakari Ailus
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!
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the net-next tree with the pm tree
2024-03-05 0:26 Stephen Rothwell
2024-03-05 10:52 ` Rafael J. Wysocki
@ 2024-03-05 13:23 ` Alex Elder
1 sibling, 0 replies; 7+ messages in thread
From: Alex Elder @ 2024-03-05 13:23 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, Jakub Kicinski, Paolo Abeni,
Rafael J. Wysocki
Cc: Networking, Linux Kernel Mailing List, Linux Next Mailing List,
Rafael J. Wysocki, Sakari Ailus
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the net-next tree with the pm tree
@ 2023-04-03 1:44 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2023-04-03 1:44 UTC (permalink / raw)
To: David Miller, Rafael J. Wysocki
Cc: Networking, Daniel Lezcano, Ido Schimmel,
Linux Kernel Mailing List, Linux Next Mailing List, Petr Machata,
Rafael J. Wysocki
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread* linux-next: manual merge of the net-next tree with the pm tree
@ 2013-06-26 3:08 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2013-06-26 3:08 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Colin Cross, Rafael J. Wysocki,
Eliezer Tamir
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-08-22 8:17 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-22 1:04 linux-next: manual merge of the net-next tree with the pm tree Stephen Rothwell
2024-08-22 8:17 ` Ido Schimmel
-- strict thread matches above, loose matches on Subject: below --
2024-03-05 0:26 Stephen Rothwell
2024-03-05 10:52 ` Rafael J. Wysocki
2024-03-05 13:23 ` Alex Elder
2023-04-03 1:44 Stephen Rothwell
2013-06-26 3:08 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox