On Mon, Sep 15, 2008 at 9:18 PM, Ned Forrester <nforrester@xxxxxxxx> wrote:
> Stephen Rothwell wrote:
>> Hi Eric,
>>
>> Today's linux-next merge of the pxa tree got a conflict in
>> drivers/spi/pxa2xx_spi.c between commit
>> 8423597d676615f3dd2d9ab36f59f147086b90b8 ("pxa2xx_spi: chipselect
>> bugfixes") from Linus' tree and commit
>> 5625ef19d54c02838c867b6a5c87823e021ac7a5 ("spi: pxa2xx_spi introduce chip
>> select gpio to simplify the common cases") from the pxa tree.
>>
>> I fixed it up (see below) and can carry the fixup (though it could be
>> fixed in the pxa tree in a merge with Linus' tree). Please check the
>> fixup.
>
> The last word I had from David Brownell, was that Eric should make his
> patch fit after mine. I think Eric was planning to re-submit, but maybe
> you have saved him the trouble. I will leave it to Eric to decide if
> you fixed everything needed.
>
I'll take off the patch to save Stephen's time on this. Sorry for the
noise.
- eric
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
