lkml.org 
[lkml]   [2020]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the devicetree tree with the arm-soc tree
On Fri, May 22, 2020 at 8:03 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
>
> diff --cc Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
> index 10a7f0752281,113f93b9ae55..000000000000
> --- a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
> +++ b/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
> @@@ -51,9 -51,8 +51,9 @@@ properties
> - description: LD20 SoC boards
> items:
> - enum:
> - - socionext,uniphier-ld20-akebi96
> - - socionext,uniphier-ld20-global
> - - socionext,uniphier-ld20-ref
> ++ - socionext,uniphier-ld20-akebi96
> + - socionext,uniphier-ld20-global
> + - socionext,uniphier-ld20-ref
> - const: socionext,uniphier-ld20
> - description: PXs3 SoC boards
> items:

Ok, thanks! I think can let Linus handle this in the merge window.

Arnd

\
 
 \ /
  Last update: 2020-05-22 10:09    [W:0.045 / U:1.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site