From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>, David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Alexandre Torgue <alexandre.torgue@st.com>
Cc: Networking <netdev@vger.kernel.org>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Gatien Chevallier <gatien.chevallier@foss.st.com>,
"Kory Maincent (Dent Project)" <kory.maincent@bootlin.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Saravana Kannan <saravanak@google.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the net-next, stm32 trees
Date: Tue, 14 May 2024 14:22:44 +1000 [thread overview]
Message-ID: <20240514142244.26010149@canb.auug.org.au> (raw)
In-Reply-To: <20240424134038.28532f2f@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2024-05-14 4:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240514142244.26010149@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alexandre.torgue@foss.st.com \
--cc=alexandre.torgue@st.com \
--cc=davem@davemloft.net \
--cc=gatien.chevallier@foss.st.com \
--cc=kory.maincent@bootlin.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=robh@kernel.org \
--cc=saravanak@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).