linux-kernel - Re: linux-next: manual merge of the mailbox tree with the devicetree tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <bc59ac67-1278-def5-2c84-c73e8a4d39ef@st.com>
Date:   Thu, 28 Nov 2019 10:25:58 +0100
From:   Arnaud POULIQUEN <arnaud.pouliquen@...com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Jassi Brar <jaswinder.singh@...aro.org>,
        Rob Herring <robherring2@...il.com>
CC:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Fabien Dessenne <fabien.dessenne@...com>
Subject: Re: linux-next: manual merge of the mailbox tree with the devicetree
 tree

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