From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Xu Subject: Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc Date: Tue, 20 Jun 2017 10:59:21 +0100 Message-ID: <5948F1F9.90903@hisilicon.com> References: <20170614082338.15673-1-guodong.xu@linaro.org> <20170614082338.15673-20-guodong.xu@linaro.org> <5947CAD8.4040607@hisilicon.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Ulf Hansson Cc: Mark Rutland , "devicetree@vger.kernel.org" , wangkefeng.wang@huawei.com, Arnd Bergmann , Guodong Xu , Linux PCI , Catalin Marinas , "linux-mmc@vger.kernel.org" , Will Deacon , "linux-kernel@vger.kernel.org" , Peter Griffin , Bjorn Helgaas , Rob Herring , Li Wei , puck.chen@hisilicon.com, xuejiancheng@hisilicon.com, zhangfei , Lee Jones , "linux-arm-kernel@lists.infradead.org" List-Id: linux-mmc@vger.kernel.org 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. Best Regards, Wei > > Kind regards > Uffe > > . > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: Subject: Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc To: Ulf Hansson References: <20170614082338.15673-1-guodong.xu@linaro.org> <20170614082338.15673-20-guodong.xu@linaro.org> <5947CAD8.4040607@hisilicon.com> From: Wei Xu Message-ID: <5948F1F9.90903@hisilicon.com> Date: Tue, 20 Jun 2017 10:59:21 +0100 MIME-Version: 1.0 In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , "devicetree@vger.kernel.org" , wangkefeng.wang@huawei.com, Arnd Bergmann , Guodong Xu , Linux PCI , Catalin Marinas , "linux-mmc@vger.kernel.org" , Will Deacon , "linux-kernel@vger.kernel.org" , Peter Griffin , Bjorn Helgaas , Rob Herring , Li Wei , puck.chen@hisilicon.com, xuejiancheng@hisilicon.com, zhangfei , Lee Jones , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset="us-ascii" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+bjorn=helgaas.com@lists.infradead.org List-ID: 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. Best Regards, Wei > > Kind regards > Uffe > > . > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: xuwei5@hisilicon.com (Wei Xu) Date: Tue, 20 Jun 2017 10:59:21 +0100 Subject: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc In-Reply-To: References: <20170614082338.15673-1-guodong.xu@linaro.org> <20170614082338.15673-20-guodong.xu@linaro.org> <5947CAD8.4040607@hisilicon.com> Message-ID: <5948F1F9.90903@hisilicon.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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. Best Regards, Wei > > Kind regards > Uffe > > . > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752599AbdFTKAe (ORCPT ); Tue, 20 Jun 2017 06:00:34 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:8763 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751060AbdFTKAa (ORCPT ); Tue, 20 Jun 2017 06:00:30 -0400 Subject: Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc To: Ulf Hansson References: <20170614082338.15673-1-guodong.xu@linaro.org> <20170614082338.15673-20-guodong.xu@linaro.org> <5947CAD8.4040607@hisilicon.com> CC: Guodong Xu , Rob Herring , "Mark Rutland" , Catalin Marinas , Will Deacon , , , Peter Griffin , , 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 From: Wei Xu Message-ID: <5948F1F9.90903@hisilicon.com> Date: Tue, 20 Jun 2017 10:59:21 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.203.181.153] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.5948F212.011A,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 8c14e1bb7b5a1207a07e199e2b2b9443 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Best Regards, Wei > > Kind regards > Uffe > > . >