lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver.
    From
    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


    \
     
     \ /
      Last update: 2012-08-07 12:21    [W:2.810 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site