Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1670649
| From | Ulf Hansson <ulf.hansson@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v3 19/21] dt-bindings: mmc: dw_mmc-k3: add document of hi3660 mmc |
| Date | 2017-06-20 12:30 +0200 |
| Message-ID | <tUoA2-7os-17@gated-at.bofh.it> (permalink) |
| References | (1 earlier) <tSbQD-2Ni-39@gated-at.bofh.it> <tU4hY-2HA-9@gated-at.bofh.it> <tU4L0-379-11@gated-at.bofh.it> <tUmRA-6dE-3@gated-at.bofh.it> <tUogG-7fS-27@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On 20 June 2017 at 11:59, Wei Xu <xuwei5@hisilicon.com> wrote: > Hi Uffe, > > On 2017/6/20 9:36, Ulf Hansson wrote: >> 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. > > 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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
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
csiph-web