From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Turquette Subject: Re: linux-next: manual merge of the clk tree with the renesas tree Date: Wed, 14 May 2014 23:33:55 -0700 Message-ID: <20140515063355.9521.79464@quantum> References: <20140515161121.39998223@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8BIT Return-path: Received: from mail-pa0-f48.google.com ([209.85.220.48]:55685 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753265AbaEOGeD convert rfc822-to-8bit (ORCPT ); Thu, 15 May 2014 02:34:03 -0400 Received: by mail-pa0-f48.google.com with SMTP id rd3so663269pab.7 for ; Wed, 14 May 2014 23:34:02 -0700 (PDT) In-Reply-To: <20140515161121.39998223@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Simon Horman Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Wolfram Sang , Geert Uytterhoeven 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@canb.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