* [PATCH] clk: qcom: Remove accidental merged reject file
@ 2014-04-30 18:15 Kumar Gala
2014-04-30 18:41 ` Sergei Shtylyov
2014-04-30 18:57 ` Mike Turquette
0 siblings, 2 replies; 3+ messages in thread
From: Kumar Gala @ 2014-04-30 18:15 UTC (permalink / raw)
To: Mike Turquette
Cc: Kumar Gala, sboyd, linux-kernel, linux-arm-kernel, linux-arm-msm
Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally
added in a merge reject file, so remove it.
Signed-off-by: Kumar Gala <galak@codeaurora.org>
---
Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej
diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej b/Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej
deleted file mode 100644
index 2e84dbe..0000000
--- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej
+++ /dev/null
@@ -1,10 +0,0 @@
---- Documentation/devicetree/bindings/clock/qcom,gcc.txt
-+++ Documentation/devicetree/bindings/clock/qcom,gcc.txt
-@@ -4,6 +4,7 @@
- Required properties :
- - compatible : shall contain only one of the following:
-
-+ "qcom,gcc-apq8064"
- "qcom,gcc-ipq8064"
- "qcom,gcc-msm8660"
- "qcom,gcc-msm8960"
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] clk: qcom: Remove accidental merged reject file
2014-04-30 18:15 [PATCH] clk: qcom: Remove accidental merged reject file Kumar Gala
@ 2014-04-30 18:41 ` Sergei Shtylyov
2014-04-30 18:57 ` Mike Turquette
1 sibling, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2014-04-30 18:41 UTC (permalink / raw)
To: Kumar Gala, Mike Turquette
Cc: linux-arm-msm, sboyd, linux-kernel, linux-arm-kernel
Hello.
On 04/30/2014 10:15 PM, Kumar Gala wrote:
> Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally
Please also specify that commit's summary in parens.
> added in a merge reject file, so remove it.
> Signed-off-by: Kumar Gala <galak@codeaurora.org>
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] clk: qcom: Remove accidental merged reject file
2014-04-30 18:15 [PATCH] clk: qcom: Remove accidental merged reject file Kumar Gala
2014-04-30 18:41 ` Sergei Shtylyov
@ 2014-04-30 18:57 ` Mike Turquette
1 sibling, 0 replies; 3+ messages in thread
From: Mike Turquette @ 2014-04-30 18:57 UTC (permalink / raw)
Cc: linux-arm-msm, sboyd, linux-kernel, linux-arm-kernel, Kumar Gala
Quoting Kumar Gala (2014-04-30 11:15:11)
> Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally
> added in a merge reject file, so remove it.
>
> Signed-off-by: Kumar Gala <galak@codeaurora.org>
I fixup'd this into "clk: qcom: Add basic support for APQ8064 global
clock controller clocks".
Thanks for the fix,
Mike
> ---
> Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej | 10 ----------
> 1 file changed, 10 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej
>
> diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej b/Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej
> deleted file mode 100644
> index 2e84dbe..0000000
> --- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ---- Documentation/devicetree/bindings/clock/qcom,gcc.txt
> -+++ Documentation/devicetree/bindings/clock/qcom,gcc.txt
> -@@ -4,6 +4,7 @@
> - Required properties :
> - - compatible : shall contain only one of the following:
> -
> -+ "qcom,gcc-apq8064"
> - "qcom,gcc-ipq8064"
> - "qcom,gcc-msm8660"
> - "qcom,gcc-msm8960"
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-30 18:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-30 18:15 [PATCH] clk: qcom: Remove accidental merged reject file Kumar Gala
2014-04-30 18:41 ` Sergei Shtylyov
2014-04-30 18:57 ` Mike Turquette
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).