[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CACRpkdZjbyQbht+UpXrrVGhAzGYPjb=HRZhJ+TvsEXhGeviJLA@mail.gmail.com>
Date: Tue, 7 Aug 2012 11:47:38 +0200
From: Linus Walleij <linus.walleij@...aro.org>
To: Lee Jones <lee.jones@...aro.org>
Cc: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
STEricsson_nomadik_linux@...t.st.com, linus.walleij@...ricsson.com,
arnd@...db.de, w.sang@...gutronix.de, linux-i2c@...r.kernel.org
Subject: Re: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik
I2C driver.
On Mon, Aug 6, 2012 at 5:35 PM, Lee Jones <lee.jones@...aro.org> wrote:
> Looks like I introduced a merge error on the last patch. Trying again:
> .../mali/mali400ko/driver/src/devicedrv/mali/arch | 1 +
(...)
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists