linux-kernel - Re: linux-next: manual merge of the clk tree with the renesas 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]

Date:	Wed, 14 May 2014 23:33:55 -0700
From:	Mike Turquette <mturquette@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	"Simon Horman" <horms@...ge.net.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Wolfram Sang" <wsa+renesas@...g-engineering.com>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: Re: linux-next: manual merge of the clk tree with the renesas tree

Quoting Stephen Rothwell (2014-05-14 23:11:21)
> Hi Mike,
> 
> Today's linux-next merge of the clk tree got a conflict in
> Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> between commit b557deadc5cc ("ARM: shmobile: r7s72100: document MSTP
> clock support") from the renesas tree and commit 5483bf698f42 ("clk:
> shmobile: r8a7779: Add MSTP clock support") from the clk tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Stephen,

Your fix is correct, per Geert's email in another thread[1].

Regards,
Mike

[1] http://www.spinics.net/lists/linux-sh/msg31748.html

> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> 
> diff --cc Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> index b5fc72621bfd,30df825d72ef..000000000000
> --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> @@@ -10,7 -10,7 +10,8 @@@ index in the group, from 0 to 31
>   Required Properties:
>   
>     - compatible: Must be one of the following
>  +    - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks
> +     - "renesas,r8a7779-mstp-clocks" for R8A7779 (R-Car H1) MSTP gate clocks
>       - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks
>       - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks
>       - "renesas,cpg-mstp-clock" for generic MSTP gate clocks
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/