Thread (11 messages) 11 messages, 3 authors, 2012-08-18

[PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.

From: Linus Walleij <hidden>
Date: 2012-08-07 09:47:42
Also in: linux-i2c, lkml

On Mon, Aug 6, 2012 at 5:35 PM, Lee Jones [off-list ref] wrote:
Looks like I introduced a merge error on the last patch. Trying again:
 .../mali/mali400ko/driver/src/devicedrv/mali/arch  |    1 +
(...)
quoted hunk ↗ jump to hunk
diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch
new file mode 120000
index 0000000..427334b
--- /dev/null
+++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch
@@ -0,0 +1 @@
+/home/ljkenny/projects/linaro/snowball/snowball/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-ux500
\ No newline at end of file
NACK, what is this stuff? It's even out-of-tree code.

Please be careful with git add -A, I prefer to use git add <pathspec>
I suspect that may be why this happened...

Please fix it up and send a v3.

Yours,
Linus Walleij
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help