Skip to contentSkip to conversation

clk: qcom: Remove accidental merged reject file

PATCH In review Kumar Gala 3 participants 3 messages Apr 30, 2014

Subsystems (4)
Device tree bindings Arm Qualcomm mailing list Common clk Qualcomm clock drivers
lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

PATCH 1/1 clk: qcom: Remove accidental merged reject file

Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally added in a merge reject file, so remove it.

Signed-off-by Kumar Gala <[email protected]>
---
 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
Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej deleted +0 -10
deleted file mode 100644
index 2e84dbe..0000000
@@ -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"
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#1 lore raw

Hello.

Quoted 1 line · Kumar Gala

Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally

Please also specify that commit's summary in parens.

Quoted 3 lines

added in a merge reject file, so remove it.

Signed-off-by Kumar Gala <[email protected]>

WBR, Sergei

#2 lore raw

PATCH 1/1 clk: qcom: Remove accidental merged reject file

In reply to Kumar Gala

Quoting Kumar Gala (2014-04-30 11:15:11)

Quoted 4 lines

Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally added in a merge reject file, so remove it.

Signed-off-by Kumar Gala <[email protected]>

I fixup'd this into "clk: qcom: Add basic support for APQ8064 global clock controller clocks".

Thanks for the fix,
Mike

Quoted 25 lines
---
 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
Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej deleted +0 -10
deleted file mode 100644
index 2e84dbe..0000000
@@ -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"
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation