lkml.org 
[lkml]   [2019]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the mailbox tree with the devicetree tree
From
Date
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

\
 
 \ /
  Last update: 2019-11-28 10:26    [W:0.053 / U:0.084 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site