* linux-next: manual merge of the devicetree tree with the net-next, stm32 trees
@ 2024-04-24 3:40 Stephen Rothwell
2024-04-24 12:28 ` Alexandre TORGUE
2024-05-14 4:22 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-04-24 3:40 UTC (permalink / raw)
To: Rob Herring, David Miller, Jakub Kicinski, Paolo Abeni,
Alexandre Torgue
Cc: Networking, Alexandre Torgue, Gatien Chevallier,
Kory Maincent (Dent Project), Linux Kernel Mailing List,
Linux Next Mailing List, Saravana Kannan
[-- Attachment #1: Type: text/plain, Size: 1953 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
drivers/of/property.c
between commits:
6a15368c1c6d ("of: property: fw_devlink: Add support for "access-controller"")
93c0d8c0ac30 ("of: property: Add fw_devlink support for pse parent")
from the net-next, stm32 trees and commit:
669430b183fc ("of: property: fw_devlink: Add support for "power-supplies" binding")
from the devicetree 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/of/property.c
index aaf3ce74f85c,4ede45001025..000000000000
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1252,8 -1242,7 +1242,9 @@@ DEFINE_SIMPLE_PROP(backlight, "backligh
DEFINE_SIMPLE_PROP(panel, "panel", NULL)
DEFINE_SIMPLE_PROP(msi_parent, "msi-parent", "#msi-cells")
DEFINE_SIMPLE_PROP(post_init_providers, "post-init-providers", NULL)
+DEFINE_SIMPLE_PROP(access_controllers, "access-controllers", "#access-controller-cells")
+DEFINE_SIMPLE_PROP(pses, "pses", "#pse-cells")
+ DEFINE_SIMPLE_PROP(power_supplies, "power-supplies", NULL)
DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
@@@ -1359,7 -1348,7 +1350,8 @@@ static const struct supplier_bindings o
{ .parse_prop = parse_backlight, },
{ .parse_prop = parse_panel, },
{ .parse_prop = parse_msi_parent, },
+ { .parse_prop = parse_pses, },
+ { .parse_prop = parse_power_supplies, },
{ .parse_prop = parse_gpio_compat, },
{ .parse_prop = parse_interrupts, },
{ .parse_prop = parse_regulators, },
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the devicetree tree with the net-next, stm32 trees
2024-04-24 3:40 linux-next: manual merge of the devicetree tree with the net-next, stm32 trees Stephen Rothwell
@ 2024-04-24 12:28 ` Alexandre TORGUE
2024-05-14 4:22 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Alexandre TORGUE @ 2024-04-24 12:28 UTC (permalink / raw)
To: Stephen Rothwell, Rob Herring, David Miller, Jakub Kicinski,
Paolo Abeni, Alexandre Torgue, Arnd Bergmann
Cc: Networking, Gatien Chevallier, Kory Maincent (Dent Project),
Linux Kernel Mailing List, Linux Next Mailing List,
Saravana Kannan
Hi Stephen
On 4/24/24 05:40, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> drivers/of/property.c
>
> between commits:
>
> 6a15368c1c6d ("of: property: fw_devlink: Add support for "access-controller"")
> 93c0d8c0ac30 ("of: property: Add fw_devlink support for pse parent")
>
> from the net-next, stm32 trees and commit:
>
> 669430b183fc ("of: property: fw_devlink: Add support for "power-supplies" binding")
>
> from the devicetree 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.
>
After remark from Saravana I just updated the stm32-next branch which
impact part of code mentioned above. I think you should get a merge
conflict on the next stm32-next merge into linux-next.
I will warn Arnd B. about those conflicts in my next PR.
regards
Alex
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the devicetree tree with the net-next, stm32 trees
2024-04-24 3:40 linux-next: manual merge of the devicetree tree with the net-next, stm32 trees Stephen Rothwell
2024-04-24 12:28 ` Alexandre TORGUE
@ 2024-05-14 4:22 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-05-14 4:22 UTC (permalink / raw)
To: Rob Herring, David Miller, Jakub Kicinski, Paolo Abeni,
Alexandre Torgue
Cc: Networking, Alexandre Torgue, Gatien Chevallier,
Kory Maincent (Dent Project), Linux Kernel Mailing List,
Linux Next Mailing List, Saravana Kannan
[-- Attachment #1: Type: text/plain, Size: 2431 bytes --]
Hi all,
On Wed, 24 Apr 2024 13:40:38 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> drivers/of/property.c
>
> between commits:
>
> 6a15368c1c6d ("of: property: fw_devlink: Add support for "access-controller"")
> 93c0d8c0ac30 ("of: property: Add fw_devlink support for pse parent")
>
> from the net-next, stm32 trees and commit:
>
> 669430b183fc ("of: property: fw_devlink: Add support for "power-supplies" binding")
>
> from the devicetree 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.
Due to the addition of commit
d976c6f4b32c ("of: property: Add fw_devlink support for interrupt-map property")
to the devicetree tree, the resolution now looks like below.
--
Cheers,
Stephen Rothwell
diff --cc drivers/of/property.c
index 0320f1ae9b4d,21f59e3cd6aa..000000000000
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1252,8 -1241,7 +1241,9 @@@ DEFINE_SIMPLE_PROP(backlight, "backligh
DEFINE_SIMPLE_PROP(panel, "panel", NULL)
DEFINE_SIMPLE_PROP(msi_parent, "msi-parent", "#msi-cells")
DEFINE_SIMPLE_PROP(post_init_providers, "post-init-providers", NULL)
+DEFINE_SIMPLE_PROP(access_controllers, "access-controllers", "#access-controller-cells")
+DEFINE_SIMPLE_PROP(pses, "pses", "#pse-cells")
+ DEFINE_SIMPLE_PROP(power_supplies, "power-supplies", NULL)
DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
@@@ -1359,10 -1398,10 +1400,12 @@@ static const struct supplier_bindings o
{ .parse_prop = parse_backlight, },
{ .parse_prop = parse_panel, },
{ .parse_prop = parse_msi_parent, },
+ { .parse_prop = parse_pses, },
+ { .parse_prop = parse_power_supplies, },
{ .parse_prop = parse_gpio_compat, },
{ .parse_prop = parse_interrupts, },
+ { .parse_prop = parse_interrupt_map, },
+ { .parse_prop = parse_access_controllers, },
{ .parse_prop = parse_regulators, },
{ .parse_prop = parse_gpio, },
{ .parse_prop = parse_gpios, },
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-14 4:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-24 3:40 linux-next: manual merge of the devicetree tree with the net-next, stm32 trees Stephen Rothwell
2024-04-24 12:28 ` Alexandre TORGUE
2024-05-14 4:22 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox