Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: linux-next: manual merge of the mailbox tree with the devicetree
 tree
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>
References: <20191128114127.0f1e3b06@canb.auug.org.au>
From:   Arnaud POULIQUEN <arnaud.pouliquen@st.com>
Message-ID: <bc59ac67-1278-def5-2c84-c73e8a4d39ef@st.com>
Date:   Thu, 28 Nov 2019 10:25:58 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.9.0
MIME-Version: 1.0
In-Reply-To: <20191128114127.0f1e3b06@canb.auug.org.au>
Content-Type: text/plain; charset="windows-1252"
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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