Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Benjamin GAIGNARD <benjamin.gaignard@st.com>
To:     Thierry Reding <thierry.reding@gmail.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>
CC:     Rob Herring <robherring2@gmail.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Fabrice GASNIER <fabrice.gasnier@st.com>
Subject: Re: linux-next: manual merge of the pwm tree with the devicetree tree
Thread-Topic: linux-next: manual merge of the pwm tree with the devicetree
 tree
Thread-Index: AQHVm29z814knmbHG0Gwcu/8qn+uuqeL6iKAgAAEQYA=
Date:   Fri, 15 Nov 2019 09:56:56 +0000
Message-ID: <53a802bb-b462-6256-9d23-3181798cdefe@st.com>
References: <20191115154456.244c27e4@canb.auug.org.au>
 <20191115094141.GA825257@ulmo>
In-Reply-To: <20191115094141.GA825257@ulmo>
Accept-Language: en-US
Content-Language: en-US
user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.9.0
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-exchange-transport-fromentityheader: Hosted
x-originating-ip: [10.75.127.49]
Content-Type: text/plain; charset="Windows-1252"
Content-ID: <626D1099C5258E4483D5C379DCA17158@st.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572
 definitions=2019-11-15_02:2019-11-15,2019-11-15 signatures=0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 11/15/19 10:41 AM, Thierry Reding wrote:
> On Fri, Nov 15, 2019 at 03:44:56PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the pwm tree got a conflict in:
>>
>>    Documentation/devicetree/bindings/pwm/pwm-stm32.txt
>>
>> between commit:
>>
>>    56fb34d86e87 ("dt-bindings: mfd: Convert stm32 timers bindings to jso=
n-schema")
>>
>> from the devicetree tree and commit:
>>
>>    4205e356285e ("dt-bindings: pwm-stm32: Document pinctrl sleep state")
>>
>> from the pwm tree.
>>
>> I fixed it up (I just deleted the file - more fixup is probably required=
)
>> and can carry the fix as necessary. This is now fixed as far as linux-ne=
xt
>> 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.
> It should be trivial to rewrite the sleep state patch on top of the
> json-schema conversion and then take that version into the devicetree
> tree.
>
> Fabrice, can you resend that patch based on the devicetree tree?
Describing sleep state in json-schema is not need since it is included

by the "top" schema.

Benjamin

>
> Thierry=