Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752088AbdFTK2z (ORCPT ); Tue, 20 Jun 2017 06:28:55 -0400 Received: from mail-qk0-f173.google.com ([209.85.220.173]:36541 "EHLO mail-qk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751046AbdFTK2x (ORCPT ); Tue, 20 Jun 2017 06:28:53 -0400 MIME-Version: 1.0 In-Reply-To: <5948F1F9.90903@hisilicon.com> References: <20170614082338.15673-1-guodong.xu@linaro.org> <20170614082338.15673-20-guodong.xu@linaro.org> <5947CAD8.4040607@hisilicon.com> <5948F1F9.90903@hisilicon.com> From: Ulf Hansson Date: Tue, 20 Jun 2017 12:28:46 +0200 Message-ID: Subject: Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc To: Wei Xu Cc: Guodong Xu , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , wangkefeng.wang@huawei.com, xuejiancheng@hisilicon.com, Peter Griffin , puck.chen@hisilicon.com, Lee Jones , Bjorn Helgaas , Arnd Bergmann , zhangfei , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-mmc@vger.kernel.org" , Linux PCI , Li Wei Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2107 Lines: 61 On 20 June 2017 at 11:59, Wei Xu wrote: > Hi Uffe, > > On 2017/6/20 9:36, Ulf Hansson wrote: >> Hi Wei, >> >> On 19 June 2017 at 15:00, Wei Xu wrote: >>> Hi Ulf, >>> >>> On 2017/6/19 13:43, Ulf Hansson wrote: >>>> On 14 June 2017 at 10:23, Guodong Xu wrote: >>>>> Add bindings for hi3660 mmc support >>>>> >>>>> Signed-off-by: Li Wei >>>>> Signed-off-by: Guodong Xu >>>>> --- >>>>> Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt | 1 + >>>>> 1 file changed, 1 insertion(+) >>>>> >>>>> diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt >>>>> index df37058..8af1afc 100644 >>>>> --- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt >>>>> +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt >>>>> @@ -12,6 +12,7 @@ extensions to the Synopsys Designware Mobile Storage Host Controller. >>>>> Required Properties: >>>>> >>>>> * compatible: should be one of the following. >>>>> + - "hisilicon,hi3660-dw-mshc": for controllers with hi3660 specific extensions. >>>>> - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extensions. >>>>> - "hisilicon,hi6220-dw-mshc": for controllers with hi6220 specific extensions. >>>>> >>>>> -- >>>>> 2.10.2 >>>>> >>>> >>>> Thanks, applied for next! >>> >>> Thanks! >>> Last week I had applied the v4 patch set[1] >>> and this patch is included. >>> But it should be fine for the upper gatekeeper to merge >>> since these 2 patch are same. >> >> No, that's not how git works. >> >> If the patch has the same hash, that would be fine, but that isn't the >> case here as we have two different hashes for the same change. > > Got it. Thanks for your explaining! > >> >> To deal with this, I have just dropped the change from my tree and >> leave it to you to carry the patch. Feel free to add my ack for it. > > Thanks! > But the pull request I sent last week has been merged. No worries, it's fine even without my ack this time. Kind regards Uffe