Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1670423

Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc

Show all headers | View raw

Hi Wei,

On 19 June 2017 at 15:00, Wei Xu <xuwei5@hisilicon.com> wrote:
> Hi Ulf,
>
> On 2017/6/19 13:43, Ulf Hansson wrote:
>> On 14 June 2017 at 10:23, Guodong Xu <guodong.xu@linaro.org> wrote:
>>> Add bindings for hi3660 mmc support
>>>
>>> Signed-off-by: Li Wei <liwei213@huawei.com>
>>> Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
>>> ---
>>>  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.

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.

Kind regards
Uffe

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/21] arm64: dts: hi3660: add device nodes Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 10:30 +0200
  [PATCH v3 12/21] arm64: dts: hi3660: add spi device nodes Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 10:30 +0200
  [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 10:30 +0200
    Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of  hi3660 mmc Ulf Hansson <ulf.hansson@linaro.org> - 2017-06-19 14:50 +0200
      Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of  hi3660 mmc Wei Xu <xuwei5@hisilicon.com> - 2017-06-19 15:20 +0200
        Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of  hi3660 mmc Ulf Hansson <ulf.hansson@linaro.org> - 2017-06-20 10:40 +0200
          Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of  hi3660 mmc Wei Xu <xuwei5@hisilicon.com> - 2017-06-20 12:10 +0200
            Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of  hi3660 mmc Ulf Hansson <ulf.hansson@linaro.org> - 2017-06-20 12:30 +0200
              Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of  hi3660 mmc Wei Xu <xuwei5@hisilicon.com> - 2017-06-20 13:00 +0200
  [PATCH v3 02/21] arm64: dts: hisilicon: update compatible string for hikey960 Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 10:30 +0200
  [PATCH v3 21/21] arm64: dts: hi3660-hikey960: add nodes for WiFi Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 10:30 +0200
  [PATCH v3 14/21] arm64: dts: hi3660: enable idle states Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 10:30 +0200
    Re: [PATCH v3 14/21] arm64: dts: hi3660: enable idle states Leo Yan <leo.yan@linaro.org> - 2017-06-15 02:30 +0200
      Re: [PATCH v3 14/21] arm64: dts: hi3660: enable idle states Guodong Xu <guodong.xu@linaro.org> - 2017-06-15 05:00 +0200
  [PATCH v3 06/21] arm64: dts: hi3660: add gpio dtsi file for Hisilicon Hi3660 SOC Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 10:30 +0200
  [PATCH v3 01/21] dt-bindings: arm: hisilicon: add bindings for HiKey960 board Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 10:30 +0200
  [PATCH v3 08/21] arm64: dts: hikey960: add WL1837 Bluetooth device node Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 12:00 +0200
  [PATCH v3 05/21] arm64: dts: Add I2C nodes for Hi3660 Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 12:00 +0200
  [PATCH v3 03/21] arm64: dts: hikey960: pinctrl: add more pinmux and pinconfig Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 12:00 +0200
  [PATCH v3 07/21] arm64: dts: hi3660: Add uarts nodes Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 12:00 +0200
  [PATCH v3 11/21] arm64: dts: hikey960: add LED nodes Guodong Xu <guodong.xu@linaro.org> - 2017-06-14 12:00 +0200

csiph-web