On Tue, Feb 9, 2010 at 4:07 PM, Tony Lindgren <t...@atomide.com> wrote:
> * Grant Likely <grant.lik...@secretlab.ca> [100209 14:38]:
>> On Tue, Feb 9, 2010 at 3:25 PM, Tony Lindgren <t...@atomide.com> wrote:
>> > * Hemanth V <heman...@ti.com> [100203 02:19]:
>> >> From ee48142ddc43129a21676dbb56a83e3e7d8063de Mon Sep 17 00:00:00 2001
>> >> From: Hemanth V <heman...@ti.com>
>> >> Date: Fri, 27 Nov 2009 14:22:30 +0530
>> >> Subject: [PATCH] Update platform files
>> >>
>> >> This patch updates platform files for
>> >> fifo, slave support
>> >>
>> >> Signed-off-by: Hemanth V <heman...@ti.com>
>> >
>> > This should get merged via the spi-devel list with the other patches.
>> >
>> > Acked-by: Tony Lindgren <t...@atomide.com>
>>
>> Personally, I prefer not to carry arch/* changes in my next-spi
>> branch, since it means that my pull requests are less obvious for
>> Linus and there is greater chance of conflict.
>>
>> But if you still really want me to merge it through my tree, (or if
>> getting the patches out of order will break things) then I'll pick it
>> up.  Just let me know.
>
> OK, if you ack it, I'll add the header into omap for-next. That
> might break git bisect for some configurations depending in which
> order the patches get pulled by Linus..

git bisect breakage is breakage enough.  :-)  You're right.  I should
pick this one up.  I can see that now that I've had my tea and I'm no
longer grumpy.

> I guess eventually this header should not live under plat.

Any reason the header cannot be moved to include/linux/spi/ now?

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to