From: Alexandre TORGUE <alexandre.torgue@foss•st.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
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>,
"Arnd Bergmann" <arnd@arndb•de>
Cc: Networking <netdev@vger•kernel.org>,
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: Wed, 24 Apr 2024 14:28:21 +0200 [thread overview]
Message-ID: <9baaed82-c118-4a60-beff-2be9dbe2a6c3@foss.st.com> (raw)
In-Reply-To: <20240424134038.28532f2f@canb.auug.org.au>
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
next prev parent reply other threads:[~2024-04-24 12:29 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 [this message]
2024-05-14 4:22 ` Stephen Rothwell
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=9baaed82-c118-4a60-beff-2be9dbe2a6c3@foss.st.com \
--to=alexandre.torgue@foss$(echo .)st.com \
--cc=alexandre.torgue@st$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=gatien.chevallier@foss$(echo .)st.com \
--cc=kory.maincent@bootlin$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=robh@kernel$(echo .)org \
--cc=saravanak@google$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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