On Mon, Apr 13, 2009 at 02:18:02PM -0700, Kevin Hilman wrote:
> "Mark A. Greer" <[email protected]> writes:
> 
> > Round 2.
> >
> > I believe I have addressed all of the issues that I agreed to address.
> > Every patch has checkpatch.pl's cleanly, builds cleanly, and has been
> > tested on a dm355 evm, dm6446 evm, and dm6467 evm.  The last patch was
> > also tested on a da830 evm.
> >
> > This series assumes that the following patches have been added:
> >
> > http://linux.omap.com/pipermail/davinci-linux-open-source/2009-March/012097.htmlhttp://linux.omap.com/pipermail/davinci-linux-open-source/2009-April/012389.html
> >
> 
> Using the commit below[1] as the starting point and applying the two
> patches you reference above, this series doesn't fully apply.
> 
> git am fails to apply patch 11, but forcing it makes it apply with
> fuzz, suggesting we have a slightly different base.  Next, patch 13
> fails to apply even after forcing due to conflicts in the at24 setup.
> I tried with and without the at24 patch you reference above and it fails
> in both cases.
> 
> What's the base commit id of the tree you're using, before the two
> commits you link to above?
> 
> Kevin
> 
> [1] commit 8a16ff458a27764d72647c4a0b57f5ec82135f88
> Author: Kevin Hilman <[email protected]>
> Date:   Thu Mar 5 11:18:20 2009 -0800
> 
>     davinci: eeprom: use new memory accessor interface
>     
>     Signed-off-by: Kevin Hilman <[email protected]>

Hmm...  They are based on 8a16ff458a27764d72647c4a0b57f5ec82135f88.

I must have resolved some conflicts in the other patches locally & forgot.
I'll forward them to you in a minute.

Mark
--

_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Reply via email to