From: Arnaud POULIQUEN <arnaud.pouliquen@st•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Jassi Brar <jaswinder.singh@linaro•org>,
Rob Herring <robherring2@gmail•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Fabien Dessenne <fabien.dessenne@st•com>
Subject: Re: linux-next: manual merge of the mailbox tree with the devicetree tree
Date: Thu, 28 Nov 2019 10:25:58 +0100 [thread overview]
Message-ID: <bc59ac67-1278-def5-2c84-c73e8a4d39ef@st.com> (raw)
In-Reply-To: <20191128114127.0f1e3b06@canb.auug.org.au>
Hi Stephen,
On 11/28/19 1:41 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mailbox tree got a conflict in:
>
> Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt
>
> between commit:
>
> 4360bf724483 ("dt-bindings: mailbox: convert stm32-ipcc to json-schema")
>
> from the devicetree tree and commit:
>
> 9b2cfd3fb09e ("dt-bindings: mailbox: stm32-ipcc: Updates for wakeup management")
>
> from the mailbox tree.
>
> I fixed it up (I just deleted the file - presumably there will need to be
> followup fixes to the json file) 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.
>
No extra patch needed, the wake up property is already integrated in the json file
Thanks for your solving the merge issue!
Regards
Arnaud
next prev parent reply other threads:[~2019-11-28 9:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-28 0:41 linux-next: manual merge of the mailbox tree with the devicetree tree Stephen Rothwell
2019-11-28 9:25 ` Arnaud POULIQUEN [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-23 4:05 Stephen Rothwell
2022-05-23 14:33 ` Krzysztof Kozlowski
2022-05-23 14:39 ` Rob Herring
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=bc59ac67-1278-def5-2c84-c73e8a4d39ef@st.com \
--to=arnaud.pouliquen@st$(echo .)com \
--cc=fabien.dessenne@st$(echo .)com \
--cc=jaswinder.singh@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robherring2@gmail$(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