From: Linus Walleij <linus.walleij@linaro.org>
To: Lee Jones <lee.jones@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
STEricsson_nomadik_linux@list.st.com,
linus.walleij@stericsson.com, arnd@arndb.de,
w.sang@pengutronix.de, linux-i2c@vger.kernel.org
Subject: Re: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.
Date: Tue, 7 Aug 2012 11:47:38 +0200 [thread overview]
Message-ID: <CACRpkdZjbyQbht+UpXrrVGhAzGYPjb=HRZhJ+TvsEXhGeviJLA@mail.gmail.com> (raw)
In-Reply-To: <20120806153503.GH10524@gmail.com>
On Mon, Aug 6, 2012 at 5:35 PM, Lee Jones <lee.jones@linaro.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
next prev parent reply other threads:[~2012-08-07 9:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-06 15:17 [PATCH 1/1] i2c: Add default configuration into the Nomadik I2C driver Lee Jones
2012-08-06 15:35 ` [PATCH 1/1 v2] " Lee Jones
2012-08-07 9:47 ` Linus Walleij [this message]
2012-08-07 11:41 ` Lee Jones
2012-08-07 15:31 ` Lee Jones
2012-08-08 12:38 ` Linus Walleij
2012-08-08 13:09 ` Lee Jones
2012-08-08 13:11 ` [PATCH 1/1 v4] " Lee Jones
2012-08-17 15:02 ` Linus Walleij
2012-08-17 19:05 ` Wolfram Sang
2012-08-18 8:01 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACRpkdZjbyQbht+UpXrrVGhAzGYPjb=HRZhJ+TvsEXhGeviJLA@mail.gmail.com' \
--to=linus.walleij@linaro.org \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=arnd@arndb.de \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=w.sang@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).